Merge changes Iec22ff63,Iaca8a7cc

* changes:
  Stop using VPNs in getDefaultNetworkCapabilitiesForUser.
  Inform ConnectivityService about always-on VPN lockdown.
tree: 3c52f22297c8a8e8ab18c2d788c97dde77496415
  1. core/
  2. service/
  3. services/
  4. tests/
  5. OWNERS