Merge changes from topic "am-7b645f7930384d4a8af3c720a9985c1d" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge changes from topic "cherrypicker-L42600000954628703:N10500001267021915" into tm-dev am: 74bda72d -s ours am: 14ccc225 -s ours am: 18c05707 -s ours
  [automerger skipped] CCodec: configure hdr-format for HDR encoder profiles am: e9707b37 -s ours am: 8769e8f2 -s ours am: 29c2634a -s ours