Merge "Clean up the keepalive slots when network disconnect" am: 192f09d63e

am: 56001c90c8

Change-Id: Id3e4e159713c0ed7e03f45169e87b73ae6408e4f

services/core/java/com/android/server/connectivity/KeepaliveTracker.java

@@ -496,10 +496,11 @@ public class KeepaliveTracker {
         if (networkKeepalives != null) {
             for (KeepaliveInfo ki : networkKeepalives.values()) {
                 ki.stop(reason);
+                // Clean up keepalives since the network agent is disconnected and unable to pass
+                // back asynchronous result of stop().
+                cleanupStoppedKeepalive(nai, ki.mSlot);
             }
         }
-        // Clean up keepalives will be done as a result of calling ki.stop() after the slots are
-        // freed.
     }
 
     public void handleStopKeepalive(NetworkAgentInfo nai, int slot, int reason) {