[automerger skipped] Allow shell uid without checking the package name. am:...

[automerger skipped] Allow shell uid without checking the package name. am: fcef7515 -s ours am: 4677409c -s ours am: 1c775373 -s ours

am skip reason: Merged-In I2867a15840a0987c948179e2f8069e652c4a0c1f with SHA-1 6db81c15 is already in history

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



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