am 072ea747: (-s ours) Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev

* commit '072ea747d3dc71ed9c9ff3fc1ba9f25cbaa1d447':
  DO NOT MERGE: Register HdmiControlService