Merge "Hide Display Theme from search results when not available" into oc-dev

am: 9f2f9e331f

Change-Id: Ie3fe1e8a7d2ac0c4045209403966dd80b7c4b5fa

src/com/android/settings/DisplaySettings.java

@@ -129,7 +129,7 @@ public class DisplaySettings extends DashboardFragment {
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    List<String> keys = new ArrayList<>();
+                    List<String> keys = super.getNonIndexableKeys(context);
                     keys.add(KEY_DISPLAY_SIZE);
                     return keys;
                 }