[automerger skipped] Add SDK level check to adding sandbox UIDs. am: 512a4fe7 -s ours

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

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



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