diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 60d1d477db53d..ed1545f000e7f 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -6333,9 +6333,10 @@ public final class Settings {
          * Comma-separated list of location providers that are enabled. Do not rely on this value
          * being present or correct, or on ContentObserver notifications on the corresponding Uri.
          *
-         * @deprecated The preferred methods for checking provider status and listening for changes
-         * are via {@link LocationManager#isProviderEnabled(String)} and
-         * {@link LocationManager#PROVIDERS_CHANGED_ACTION}.
+         * @deprecated This setting no longer exists from Android S onwards as it no longer is
+         * capable of realistically reflecting location settings. Use {@link
+         * LocationManager#isProviderEnabled(String)} or {@link LocationManager#isLocationEnabled()}
+         * instead.
          */
         @Deprecated
         public static final String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 6dd2936cfb004..36213a020783e 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3342,7 +3342,7 @@ public class SettingsProvider extends ContentProvider {
         }
 
         private final class UpgradeController {
-            private static final int SETTINGS_VERSION = 193;
+            private static final int SETTINGS_VERSION = 194;
 
             private final int mUserId;
 
@@ -4754,6 +4754,13 @@ public class SettingsProvider extends ContentProvider {
                     currentVersion = 193;
                 }
 
+                if (currentVersion == 193) {
+                    // Version 193: remove obsolete LOCATION_PROVIDERS_ALLOWED settings
+                    getSecureSettingsLocked(userId).deleteSettingLocked(
+                            Secure.LOCATION_PROVIDERS_ALLOWED);
+                    currentVersion = 194;
+                }
+
                 // vXXX: Add new settings above this point.
 
                 if (currentVersion != newVersion) {