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

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

Change-Id: I5b6b70ae00de8752b1033fc35bacc91549fe5dea