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

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into sc-dev am: ffad8fe8 -s ours

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

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



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