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

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into sc-v2-dev am: 518bbf8a -s ours am: e0c1dfad -s ours am: 2f645025 -s ours am: 0ad09781 -s ours

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

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



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