Merge changes I446a8595,I68d2293f

* changes:
  Add VpnManager calls to ConnectivityService
  Add basic logic for profile-based VPNs

core/java/android/net/IConnectivityManager.aidl

@@ -120,6 +120,14 @@ interface IConnectivityManager
 
     ParcelFileDescriptor establishVpn(in VpnConfig config);
 
+    boolean provisionVpnProfile(in VpnProfile profile, String packageName);
+
+    void deleteVpnProfile(String packageName);
+
+    void startVpnProfile(String packageName);
+
+    void stopVpnProfile(String packageName);
+
     VpnConfig getVpnConfig(int userId);
 
     @UnsupportedAppUsage