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

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into sc-qpr1-dev am: 4c6e8496 -s ours

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

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



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