[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into sc-dev am: ffad8fe8cf -s ours am: ff826dc8bf -s ours am: a9b99d8178 -s ours am: c1d7f9fef9 -s ours am: dcec845b48 -s ours am: 01c4ef6314 -s ours am: 866cfa9f7b -s ours

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

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

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