tree ab30c95b629b64b82697a7cd40239d7198521089
parent 30bb33f5c0c0085953cb50f2ff570b85bd32e975
parent ae49f6047851f61a23b63f9af19e5ecffc79d0f8
author Kunal Malhotra <malhk@google.com> 1696397179 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696397179 +0000

[automerger skipped] 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 am: ae49f60478 -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: Ib4c75a2e79ba8555cfba209a32a4a64563a00f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>