Merge "Merge "Add SDK level check to adding sandbox UIDs." am: e202bd7d am:...

Merge "Merge "Add SDK level check to adding sandbox UIDs." am: e202bd7d am: d0091f2a" into tm-dev-plus-aosp am: a1979fa8

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



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