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

am: 72a94e9f5a

Change-Id: I7748c0537a6eebb1fd460b3039a9a53dc070e19e

src/com/android/settings/gestures/AssistGesturePreferenceController.java

@@ -67,6 +67,7 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
         mPreference = screen.findPreference(getPreferenceKey());
         if (!mFeatureProvider.isSupported(mContext)) {
             mScreen.removePreference(mPreference);
+            removePreference(mScreen, getPreferenceKey());
             return;
         }
         // Call super last or AbstractPreferenceController might remove the preference from the