[automerger skipped] Merge "Add in sandbox UIDs when configuring VPN." into...

[automerger skipped] Merge "Add in sandbox UIDs when configuring VPN." into tm-dev am: a8455d08 -s ours am: e3c0d446 -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: I8bf4d333a254d874ecf8458cebb1dbd2bab1babb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>