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

Merge "Allow shell uid without checking the package name." into tm-dev am: 5caf3932 am: 1282e605

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



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