Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev