Merge "Define MotionEventFlag as an AIDL enum" into main