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: 744f8ff8 am: d50cec8b am: 96c85155

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



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