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

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

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