[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into...

[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: b85fc661 -s ours am: 7dfe98eb -s ours am: 02ef4b6e -s ours am: b2069eee -s ours

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

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

Change-Id: I90b962d567d60219615e5b86b99aa32241ad284e