Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43

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

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