Merge "Make auto-rotate pref not reset on upgrade" into pi-dev

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

@@ -3522,14 +3522,7 @@ public class SettingsProvider extends ContentProvider {
                 }
 
                 if (currentVersion == 150) {
-                    // Version 151: Reset rotate locked setting for upgrading users
+                    // Version 151: Removed.
-                    final SettingsState systemSettings = getSystemSettingsLocked(userId);
-                    systemSettings.insertSettingLocked(
-                            Settings.System.ACCELEROMETER_ROTATION,
-                            getContext().getResources().getBoolean(
-                                    R.bool.def_accelerometer_rotation) ? "1" : "0",
-                            null, true, SettingsState.SYSTEM_PACKAGE_NAME);
-
                     currentVersion = 151;
                 }