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

Change-Id: I72ad306a62e999cb15b469887371a1d950228fbf