[automerger skipped] Merge "Merge "Adding in verification of calling UID in...

[automerger skipped] Merge "Merge "Adding in verification of calling UID in onShellCommand" into rvc-dev am: 7c905e10 am: ca34073d am: 8f6b8d31 am: 868bc803 am: 264a36f6 am: 632a8b8a am: fe967cb3 am: aaaf2b6c am: 820883f2 am: df661ad6" into udc-qpr-dev-plus-aosp am: 92e23450 -s ours

am skip reason: Merged-In I68903ebd6d3d85f4bc820b745e3233a448b62273 with SHA-1 3ef3f18b 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>