Merge changes I446a8595,I68d2293f

* changes:
  Add VpnManager calls to ConnectivityService
  Add basic logic for profile-based VPNs
tree: 0d02da06252d71eb9f79ef72a2308cc9e138282b
  1. core/
  2. services/
  3. tests/