Merge changes I446a8595,I68d2293f

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