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

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



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