[automerger skipped] Merge "Grant HDMI_CEC permission to Shell" am: 63340382...

[automerger skipped] Merge "Grant HDMI_CEC permission to Shell" am: 63340382 am: d7781b46 am: 18f56462 -s ours

am skip reason: Change-Id Ia997f3910ab4ca3a149b2cbd3b1d3d7e9f7202f2 with SHA-1 089e1512 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia854ec364516c3dd4baabe64b0a1d07a34b70070