[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am:...

[automerger skipped] [CDM][CMD] Check permissions for CDM shell commands am: 8d008c61 -s ours am: 6e8e37dd -s ours am: d0759ba2 -s ours am: a9f6ea27 -s ours am: b0b2e390 -s ours am: 8ecf0eb7 -s ours am: acdf8234 -s ours am: ce543c23 -s ours

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

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



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