[automerger skipped] Merge "Fix stuck HDMI-CEC actions after boot" am: d801feda70 -s ours am: 5f35a1d2d3 -s ours am: daf25cf47c -s ours am: 4895ad6bd9 -s ours am: a4f620a730 -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: I2880dee86d33472bd53d61211fbfdfe2b91ec0aa
This commit is contained in: