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 am: 7cb406a8

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



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