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

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

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

Change-Id: Ia70e96971d08dd32587c38e344e97f145573ba0d