Merge "Remove unnecessary STOPSHIP." into qt-dev

am: ed3136b72d

Change-Id: I8155cbd70d2ad8daffa7b0fc9f67904d8e4ca02a

src/com/android/settings/development/OverlayCategoryPreferenceController.java

@@ -198,8 +198,8 @@ public class OverlayCategoryPreferenceController extends DeveloperOptionsPrefere
     @Override
     protected void onDeveloperOptionsSwitchDisabled() {
         super.onDeveloperOptionsSwitchDisabled();
-        // STOPSHIP b/122308197: reset the overlays to the set in
-        // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES
+        // TODO b/133222035: remove these developer settings when the
+        // Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES setting is used
         setOverlay(PACKAGE_DEVICE_DEFAULT);
         updateState(mPreference);
     }