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 am: 744f8ff8b2 am: d50cec8b1f am: 96c851555f am: 736e35451f

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

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