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

[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-dev am: 52fdfaa4 am: 2a543305 -s ours am: 86b6ce58 -s ours am: b2d3d699 -s ours am: d03edf3b -s ours

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

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



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