[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: 11b31c573f -s ours am: 7e77f84315 -s ours am: 973da6bd47 -s ours
am skip reason: Change-Id Ic979dad73983d722365849fbfb0becfd432b894c with SHA-1 e3bcbc0ec7 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869883
Change-Id: I03b086429c8a1095ad6effe421b3256492a127d4
This commit is contained in: