Merge "Fix CTS, Remove CONFIGURE_ASSIST_GESTURE permission" into oc-dr1-dev am: cad75e2437
am: acdaaea57e

Change-Id: Ibb15331f28dbe105e7febdead34a752ff6328247