[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am:...

[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda -s ours am: 5f35a1d2 -s ours am: daf25cf4 -s ours

am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 62eafa25 is already in history

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

Change-Id: I32a4842c436d73a67c98b0e11ce50e05bf54c051