Merge "Revert "Ignore HdmiControlManagerHostTest""