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 am: 3fdfa275

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



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