[automerger skipped] Merge "Add in sandbox UIDs when configuring VPN." into tm-dev am: a8455d08 -s ours am: e3c0d446 -s ours am: 70d52ef7 -s ours am: 8be70485 -s ours

am skip reason: Merged-In I634f47a013fa2e42908d963fcd0634778298fee5 with SHA-1 55c261ad is already in history

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



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