Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e103a am: ca34073d93

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

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