Merge "Change the HDR conversion VTS test to take into account sink device...

Merge "Change the HDR conversion VTS test to take into account sink device capabilities" into udc-dev am: 9bd4fb37 am: a0333416

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23029343



Change-Id: I00c05da1a5cb912fe05dc6ab0c97aa80adbb2099
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>