Merge "Set correct owner UID for VPN agentConnect()" am: 08447ffcc0

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

Change-Id: I04609b41c9e878e1e3ca8f128d86290012d4ede7
tree: 62d59b4c221731c553c27be1cd4e006377e60f80
  1. core/
  2. services/
  3. tests/