Merge "Set correct owner UID for VPN agentConnect()" am: 2f7bb517fd am: bab1782868 am: d01a9458ed

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

Change-Id: Id56df437468962eea48b453c99564f68e3b38756
tree: 32906d8dfcca3f147dfd0473e07bc6ebc3c51f29
  1. core/
  2. services/
  3. tests/