resolved conflicts for merge of 248d8d2c to master

Change-Id: Idd0ad9b1504fddf68c4c4cc04731de1eddd204b3

core/java/android/net/ConnectivityManager.java

@@ -1373,4 +1373,16 @@ public class ConnectivityManager {
         }
         return timeOutMs;
     }
+
+    /**
+     * Get the carrier provisioning url.
+     * {@hide}
+     */
+    public String getMobileProvisioningUrl() {
+        try {
+            return mService.getMobileProvisioningUrl();
+        } catch (RemoteException e) {
+        }
+        return null;
+    }
 }

core/java/android/net/IConnectivityManager.aidl

@@ -137,4 +137,6 @@ interface IConnectivityManager
     int findConnectionTypeForIface(in String iface);
 
     int checkMobileProvisioning(boolean sendNotification, int suggestedTimeOutMs, in ResultReceiver resultReceiver);
+
+    String getMobileProvisioningUrl();
 }