Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: 65efcc84a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869883

Change-Id: I84b0010488024aa9867ad4af7a4013854cdeeaa1