Merge changes Ib9b04f7e,I8204e903 into main

* changes:
  KeyEvent: Add IntDef annotations for action, meta state, and flag
  MotionEvent: Add IntDef annotations for action, flag, axis, and button