Merge "HDMI: Add @VisibleForTesting annotation in HdmiCecCallback methods"