Merge "Grant HDMI_CEC permission to Shell" am: 63340382e0 am: d7781b465e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0540d3bb3989e436c98d222aff6aa4c30a630a2