Merge "Store original values of replaced settings in Settings.Secure" into rvc-dev am: f2fd74fbdb am: 62bdcabed5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11867444

Change-Id: Ib249e54d72abe1be32408b90e41b0f96f0d0b81f

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

@@ -219,7 +219,9 @@ public class SettingsHelper {
      */
     @VisibleForTesting
     public String getRealValueForSystemSetting(String setting) {
-        return Settings.System.getString(mContext.getContentResolver(),
+        // The real value irrespectively of the original setting's namespace is stored in
+        // Settings.Secure.
+        return Settings.Secure.getString(mContext.getContentResolver(),
                 setting + SETTING_ORIGINAL_KEY_SUFFIX);
     }