am 420fce97: (-s ours) am e02ae484: am 9ad6a471: am 07b481a9: Merge "CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE" into lmp-dev automerge: 0c749390 -s ours
* commit '420fce97':
CEC: Add missing protections for some HdmiControlService API - DO NOT MERGE