resolved conflicts for merge of b6b9fe21 to master

Change-Id: If4f62aa1fd8bb774288a677e7008e86a7e3ea6d9

diff --cc core/java/android/net/ConnectivityManager.java
Simple merge

diff --cc core/java/android/net/IConnectivityManager.aidl
Simple merge

diff --cc services/core/java/com/android/server/ConnectivityService.java
index 8330e88,478b48b..4569451
--- 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
@@@ -64,7 -62,7 +62,6 @@@ import android.net.NetworkUtils
  import android.net.Proxy;
  import android.net.ProxyInfo;
  import android.net.RouteInfo;
--import android.net.SamplingDataTracker;
  import android.net.UidRange;
  import android.net.Uri;
  import android.os.Binder;