Merge "Remove redundant logs in HdmiControlServiceTests" into sc-dev