Merge "Assist gesture setting should not be available on unsupported devices"...
Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev am: 72a94e9f
am: 408efb26
Change-Id: I696511821f64f7bc09819cf1d45374125b7905c0