Merge changes If2201f39,Ia1c366c5

* changes:
  Stop calling Vpn#updateCapabilities in CS.
  Stop accessing VPNs in checkConnectivityDiagnosticsPermissions.
tree: 9d4d3d26ab28b100e054ea5edfb4fb053f8ed85d
  1. core/
  2. services/
  3. tests/