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

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-qpr-dev am: 79d7cf74 -s ours

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

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



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