Merge changes Ide9daebc,Id47ada57

* changes:
  Ensure all VPN runners clean up state when exiting
  Enforce restricted user, getConnectionOwnerUid checks