automerge: 0c749390 -s ours * commit '0c749390': CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE