Merge changes I4256ca5f,I91528e1a,I48bd594c

* changes:
  Change ConnectivityServiceTest to prepare for VPN code move.
  Add to VpnManager the VPN APIs used by Settings and SystemUI.
  Remove temporary hack in VpnTest.
tree: b16ff5c0437f7789bac7087f8efbb630a994c25c
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS