Merge "Rename object mNetd to mNetworkManagementService"

diff --cc services/core/java/com/android/server/ConnectivityService.java
index 64ad912,1d142f4..4e75f3b
--- 1/services/core/java/com/android/server/ConnectivityService.java
--- 2/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@@ -5103,9 -5091,9 +5103,9 @@@ public class ConnectivityService extend
  
      private void makeDefault(NetworkAgentInfo newNetwork) {
          if (DBG) log("Switching to new default network: " + newNetwork);
 -        setupDataActivityTracking(newNetwork);
 +
          try {
-             mNetd.setDefaultNetId(newNetwork.network.netId);
+             mNMS.setDefaultNetId(newNetwork.network.netId);
          } catch (Exception e) {
              loge("Exception setting default network :" + e);
          }