Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev
automerge: 0c74939  -s ours

* commit '0c74939024cb2aec9e8348808366170d77d6e8e7':
  CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE