Merge "framework:base: iterator error in singletone provider"

services/java/com/android/server/am/ActivityManagerService.java

@@ -6267,6 +6267,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                     // it runs in the process of the default user.  Get rid of it.
                     providers.remove(i);
                     N--;
+                    i--;
                     continue;
                 }