tree 4541892db524e7ac77ac368661a5457ddbffe6c4
parent 071029112210c1b5ef5355c5438297ce4eddcf32
parent 290e10139950e5e2c737f6a012c25175d7d5561b
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1712368642 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712368642 +0000

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into sc-qpr1-dev am: 4c6e84962b -s ours am: b526b9ad28 -s ours am: da1b9e4480 -s ours am: 290e101399 -s ours

am skip reason: Merged-In I5539b3594feb5544c458c0fd1061b51a0a808900 with SHA-1 eb68b0d423 is already in history

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

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