am 069f4cbc: Merge "Fix memory leak in Connectivity Service when phone app crashes"

* commit '069f4cbccb651d98e4c50eca4698624ea089804d':
  Fix memory leak in Connectivity Service when phone app crashes

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

@@ -2022,6 +2022,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
                         ReapUnvalidatedNetworks.DONT_REAP);
             }
         }
+        NetworkFactoryInfo nfi = mNetworkFactoryInfos.remove(msg.replyTo);
+        if (DBG && nfi != null) log("unregisterNetworkFactory for " + nfi.name);
     }
 
     // If this method proves to be too slow then we can maintain a separate