Merge "Remove Special App Access duplicate from Setting search" into oc-dev

src/com/android/settings/applications/AppAndNotificationDashboardFragment.java

@@ -82,5 +82,13 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
                 public List<PreferenceController> getPreferenceControllers(Context context) {
                     return buildPreferenceControllers(context);
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add((new SpecialAppAccessPreferenceController(context))
+                            .getPreferenceKey());
+                    return keys;
+                }
             };
 }