Merge "[DO NOT MERGE] [Verifier] Revert HDR Capabiliites test" into stage-aosp-rvc-ts-dev