Merge "Expose VPN_UID" am: 58f7a60187

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

Change-Id: Ib4f8073b2bd3962433d428df85aaee508ebd6ade