Merge "CodecInfoTest: Make P010 test conditional based on HDR display" into stage-aosp-tm-ts-dev