Merge "Add in sandbox UIDs when configuring VPN." into tm-dev am: a8455d08 am: e3b18ac1

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



Change-Id: Ia1019d4f9ae7d02efb226b1d4c6bc47df306b632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>