[automerger skipped] Merge "Revert "Adding in verification of calling UID in...

[automerger skipped] 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 am: 736e3545 am: 267c98e1 -s ours

am skip reason: Merged-In I30e993a848a4cab819f2b3d7958f279806e1f530 with SHA-1 60383b3d is already in history

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



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