[automerger skipped] Merge "Add in sandbox UIDs when configuring VPN." into tm-dev am: a8455d088b -s ours
am skip reason: Merged-In I634f47a013fa2e42908d963fcd0634778298fee5 with SHA-1 55c261ade6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17884328
Change-Id: I9a128da42f4fbc18ef086f4525eba7199722a3ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: