Merge "Revert "[CEC Configuration] Add listener support to the HdmiCecConfig""