[automerger skipped] Add in sandbox UIDs when configuring VPN. am: 27e9fdd5 -s ours am: 786d9f39 -s ours am: 7f7d8eb4 -s ours am: e46bcd97 -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: I8ce24d5e52a65cb2fcf62a64a65152fdee683cc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>