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

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

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