Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev
am: 72a94e9f5a

Change-Id: I7748c0537a6eebb1fd460b3039a9a53dc070e19e