[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: b85fc66146 am: 0ee3fd9337 -s ours am: bc60884f15 -s ours
am skip reason: Change-Id Ic979dad73983d722365849fbfb0becfd432b894c with SHA-1 26d2378f5b is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11869883
Change-Id: I474985691913c254b8683d375641c7c8319a0729
This commit is contained in: