Merge "Revert "Adding in verification of calling UID in onShellCommand"" into rvc-dev am: 75aaa4c2ea am: e327817f65 am: c4cd5efae8 am: d03e368756 am: fb517df3a7 am: 768f53651e

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

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