Merge "[automerger skipped] Add SDK level check to adding sandbox UIDs. am:...

Merge "[automerger skipped] Add SDK level check to adding sandbox UIDs. am: 512a4fe7 am: 2c3b5487 -s ours" into tm-d1-dev-plus-aosp am: 257dc308 -s ours

am skip reason: Merged-In If453e16e680f46cf2b9eb769e5607fb5513b32ac with SHA-1 512a4fe7 is already in history

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



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