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

Change-Id: Iff57ca1a3b59517218085239e23c68a4315230e1