Merge "Expose VPN_UID" am: 58f7a60187 am: 8710bc1755

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

Change-Id: Idb15fe2671eac19159cc7f58319cdff7d4663bee