Merge "CEC: Prevent NPE on HDMI_CONTROL_AUTO_DEVICE_OFF_ENABLED change"