[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 am: e3b18ac1 am: 18ed4cd3 -s ours

am skip reason: Merged-In I634f47a013fa2e42908d963fcd0634778298fee5 with SHA-1 27e9fdd5 is already in history

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



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