[automerger skipped] Merge "Set correct owner UID for VPN agentConnect()" into rvc-dev am: 11b31c573f -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: I7df1004e885ff680a48d57e41987eb12f990875c
tree: 584b55e2ed704c7e0c2301b3c4572176694f6eef
  1. core/
  2. services/
  3. tests/