Merge "Ensure handleUpdateLinkProperties runs on the CS handler thread." am: a8820983b3

am: b0cda1581d

Change-Id: I14555061639da3b04b4bca74c692ac94e5713c74

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

@@ -5565,6 +5565,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
     }
 
     public void handleUpdateLinkProperties(NetworkAgentInfo nai, LinkProperties newLp) {
+        ensureRunningOnConnectivityServiceThread();
+
         if (getNetworkAgentInfoForNetId(nai.network.netId) != nai) {
             // Ignore updates for disconnected networks
             return;