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

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

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