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

[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master am: 5d7bfac8 am: 80df3099 am: 75b045da am: 0931e446 -s ours

am skip reason: Merged-In I0050ca927bdba939b0b0030a6aa2f6235b11ff5c with SHA-1 22dc89a8 is already in history

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

Change-Id: If5342ff640855a024610d459bafa437d041b3fa0