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

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

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