[automerger skipped] Merge "Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e103a am: ca34073d93 am: 8f6b8d313d am: 868bc803ff am: 264a36f6d0 am: 632a8b8a43 am: fe967cb3b4 am: aaaf2b6cec am: 820883f26e am: df661ad61f" into udc-qpr-dev-plus-aosp am: 92e234503f -s ours

am skip reason: Merged-In I68903ebd6d3d85f4bc820b745e3233a448b62273 with SHA-1 3ef3f18ba3 is already in history

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

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