Merge "Fix stuck HDMI-CEC actions after boot" into stage-aosp-master