Merge "DO NOT MERGE: Register HdmiControlService" into lmp-preview-dev