Merge "Revert "Adding in verification of calling UID in onShellCommand"" into...

Merge "Revert "Adding in verification of calling UID in onShellCommand"" into rvc-dev am: 75aaa4c2 am: e327817f am: c4cd5efa am: d03e3687 am: fb517df3 am: 768f5365 am: d6f0e982 am: 4e88beae am: 92bf0178

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



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