Misc clean up in search

- Remove updateFromClassNameResource() because it's just a no-op method.
- Simplify SearchIndexResources
- Update some pref pages to have unique keys.

Change-Id: I51e542d9947aafd046861ce7be0b4c7213fcd01d
Fixes: 64951285
Test: UniquePreferenceKeyTest
Test: robotest
Bug: 67852637

src/com/android/settings/SecuritySettings.java

@@ -17,7 +17,6 @@
 package com.android.settings;
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
-
 import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
 
 import android.app.Activity;
@@ -382,14 +381,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
         // Advanced Security features
         initTrustAgentPreference(root, numberOfTrustAgent);
 
-        // The above preferences come and go based on security state, so we need to update
-        // the index. This call is expected to be fairly cheap, but we may want to do something
-        // smarter in the future.
-        final Activity activity = getActivity();
-        FeatureFactory.getFactory(activity).getSearchFeatureProvider().getIndexingManager(activity)
-                .updateFromClassNameResource(SecuritySettings.class.getName(),
-                        true /* includeInSearchResults */);
-
         PreferenceGroup securityStatusPreferenceGroup =
                 (PreferenceGroup) root.findPreference(KEY_SECURITY_STATUS);
         final List<Preference> tilePrefs = mDashboardFeatureProvider.getPreferencesForCategory(