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 am: 1564fb88

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



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