Merge "Add more debug message to HdmiControlService" into lmp-dev