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

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

Change-Id: I4899b2fe5733d24797d33a48069f15a9d4686bb5