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

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

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

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