[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: ff826dc8 -s ours am: a9b99d81 -s ours am: c1d7f9fe -s ours am: dcec845b -s ours am: 01c4ef63 -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: I0124821c1ff98dcf9ac0ef67a6cc1aea3382ff29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>