Merge changes Ide9daebc,Id47ada57

* changes:
  Ensure all VPN runners clean up state when exiting
  Enforce restricted user, getConnectionOwnerUid checks
tree: 0307b40baa4b6e6cc31271602ef0f6bc539a725a
  1. core/
  2. services/
  3. tests/