Merge "Set correct owner UID for VPN agentConnect()" am: 7efd5a48e0 am: 8cabf350b5 am: fe747eaff7

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

Change-Id: Id56df437468962eea48b453c99564f68e3b38756