Merge "CEC: Revisit the behavior of HDMI_SYSTEM_AUDIO_ENABLED"