Merge "Merge "Allow shell uid without checking the package name." into tm-dev...

Merge "Merge "Allow shell uid without checking the package name." into tm-dev am: 5caf3932 am: f9d1137b" into tm-d1-dev-plus-aosp am: b20f0da7

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



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