Merge changes from topic "am-8fb5dcdd3c164ba0a9070b3765b4f14c" into main

* changes:
  Merge changes from topic "am-a0fdb9020d3c415a9d8ce1bf6e88dfa4" into android14-tests-dev am: 2a602ff64e -s ours
  [automerger skipped] Merge "mediav2 CTS: limit validation of hdr metadata to vp9 in Android T" into android13-tests-dev am: 729cad72c8 -s ours am: 63e36e2400 -s ours
1 file changed