Merge "Reorder VerifiedKey/MotionEvent structs for hwasan"