am 32b52923: (-s ours) Merge "DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService" into lmp-preview-dev

* commit '32b529231a45bef4d3b4b5ffcfc1c4de30f9e10e':
  DO NOT MERGE: Stop publishing HdmiCecService, start publishing HdmiControlService