[automerger skipped] Merge "[CDM][CMD] Check permissions for CDM shell commands" into tm-dev am: 52fdfaa4e3 am: 48d505f5e3 -s ours am: a211b9446f -s ours am: b48573e0c8 -s ours

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

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

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