Merge "[SettingsProvider] fix configs cache update" into udc-dev am: f1f08c6f40

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

Change-Id: If818b6e80d691a797d5b7aa4e5931f917657e47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/provider/Settings.java

@@ -3431,7 +3431,7 @@ public final class Settings {
                                     + " type:" + mUri.getPath()
                                     + " in package:" + cr.getPackageName());
                         }
-                        for (int i = 0; i < mValues.size(); ++i) {
+                        for (int i = mValues.size() - 1; i >= 0; i--) {
                             String key = mValues.keyAt(i);
                             if (key.startsWith(prefix)) {
                                 mValues.remove(key);