Merge "Change the HDR conversion VTS test to take into account sink device capabilities" into udc-dev