Merge "Using defensive copy for default request remove" am: 1444e3eea1 am: 6cc86364fb am: 463695caae am: b69e99424e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib61a89c730b84c5a2df421d1bdaa67a47e817b22

services/core/java/com/android/server/ConnectivityService.java

@@ -9033,7 +9033,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
 
     private void updateDefaultNetworksForOemNetworkPreference(
             @NonNull final Set<NetworkRequestInfo> nris) {
-        handleRemoveNetworkRequests(mDefaultNetworkRequests);
+        // Pass in a defensive copy as this collection will be updated on remove.
+        handleRemoveNetworkRequests(new ArraySet<>(mDefaultNetworkRequests));
         addPerAppDefaultNetworkRequests(nris);
     }