[automerger skipped] Merge "mediav2 CTS: If output is tonemapped, configure color format correctly" into udc-dev am: 0380029d1c am: 673027c7ba -s ours am: 7887e315a7 -s ours am: 6024de78e3 -s ours

am skip reason: Merged-In Ib4980c0b8a38c727deac998f84f53c9ffd5fd581 with SHA-1 8aaf68327d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/23713199

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