Merge "Remove a second unwanted search result"

src/com/android/settings/security/screenlock/ScreenLockSettings.java

@@ -39,6 +39,8 @@ public class ScreenLockSettings extends DashboardFragment
 
     private static final String TAG = "ScreenLockSettings";
 
+    private static final String KEY_LOCK_SCREEN_TITLE = "security_settings_password_sub_screen";
+
     private static final int MY_USER_ID = UserHandle.myUserId();
     private LockPatternUtils mLockPatternUtils;
 
@@ -102,5 +104,12 @@ public class ScreenLockSettings extends DashboardFragment
                     return buildPreferenceControllers(context, null /* parent */,
                             null /* lifecycle */, new LockPatternUtils(context));
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    final List<String> keys = super.getNonIndexableKeys(context);
+                    keys.add(KEY_LOCK_SCREEN_TITLE);
+                    return keys;
+                }
             };
 }