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

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-dev am: 52fdfaa4 am: 48d505f5 -s ours am: a211b944 -s ours am: b48573e0 -s ours am: 79a3a086 -s ours am: 4dc4a6d7 -s ours

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

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



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