Merge "Decrement networkRequestPerUid when callbacks are unregistered." am: dcf92c32c6

Change-Id: I1ac0276aa434748dbb22b82f0c4aca917875b168

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

@@ -7893,6 +7893,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);
     }