[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell...

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into udc-dev am: 3409c5db am: 98ce226a -s ours am: 7c848743 -s ours

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

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



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