Merge "Remove the SDR type from list returned by GetSupportedHdrOutputTypes" into udc-dev