Remove duplicates in Security Settings

Duplicates:
- Location
- Scanning
- Encryption and Credentials
- Screen Pinning
- Device Admin Apps

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Id06b6d9e82769abfa31a0c3e9900bcebdbd0c13c
Merged-In: I91566b8fb7fdb3b39c8833a6fa8e52bbbf6507b6

src/com/android/settings/SecuritySettings.java

@@ -102,6 +102,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String KEY_UNIFICATION = "unification";
     @VisibleForTesting
     static final String KEY_LOCKSCREEN_PREFERENCES = "lockscreen_preferences";
+    private static final String KEY_ENCRYPTION_AND_CREDENTIALS = "encryption_and_credential";
+    private static final String KEY_LOCATION_SCANNING  = "location_scanning";
 
     private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
     private static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
@@ -930,7 +932,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-            final List<String> keys = new ArrayList<String>();
+            final List<String> keys = super.getNonIndexableKeys(context);
 
             LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
 
@@ -952,6 +954,14 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 keys.add(KEY_ENTERPRISE_PRIVACY);
             }
 
+            // Duplicate in special app access
+            keys.add(KEY_MANAGE_DEVICE_ADMIN);
+            // Duplicates between parent-child
+            keys.add((new LocationPreferenceController(context)).getPreferenceKey());
+            keys.add(KEY_ENCRYPTION_AND_CREDENTIALS);
+            keys.add(KEY_SCREEN_PINNING);
+            keys.add(KEY_LOCATION_SCANNING);
+
             return keys;
         }
     }