[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: b85fc66146 -s ours am: 7dfe98eb63 -s ours

am skip reason: Change-Id Ic979dad73983d722365849fbfb0becfd432b894c with SHA-1 212b7e9edb is in history

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

Change-Id: Idd7465eef4ae2cd482f6fe70ca3bee0c3260e74b