Merge "Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: 91082128c8 am: fb3a30721d am: ac99ab6d31" into rvc-d1-dev-plus-aosp am: c6f71c443e am: 0cfa65309a

Change-Id: Ic1d2158d8a7550cdde0c7f6d871f9c167fdaf62e

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

@@ -7902,6 +7902,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
             return;
         }
 
+        // Decrement the reference count for this NetworkRequestInfo. The reference count is
+        // incremented when the NetworkRequestInfo is created as part of
+        // enforceRequestCountLimit().
+        decrementNetworkRequestPerUidCount(nri);
+
         cb.asBinder().unlinkToDeath(mConnectivityDiagnosticsCallbacks.remove(cb), 0);
     }