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

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into udc-qpr-dev am: 282ca36d -s ours

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

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



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