Merge changes from topic "am-5c49126713864de48797e12bf7acf180" into rvc-d1-dev-plus-aosp

* changes:
  Merge "Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..."" into rvc-dev am: ba8fbc6237 am: 16fd1c3a2d
  Revert "[DO NOT MERGE] Remove ASSIST_GESTURE action from deferre..." am: ac8a09f798 am: c9fc093ffb