[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into sc-v2-dev am: 518bbf8a0f -s ours am: e0c1dfad83 -s ours am: 77dc49b6c6 -s ours am: 07a827a126 -s ours am: 9b313782e7 -s ours am: 6381135ce2 -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: Ie734e578c46df3c197ff6de5288cf1dcb7c2c666
Signed-off-by: Automerger Merge Worker <[email protected]>