[automerger skipped] CCodec: handle color-transfer-request am: 58d8333d am:...

[automerger skipped] CCodec: handle color-transfer-request am: 58d8333d am: ceb6f8df am: 4bb55f61 -s ours

am skip reason: Change-Id I545e989056366184b5c142ebe70bbcd2ef80adc0 with SHA-1 3baecdaa is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1596372

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia7a1806ee7e1fde1f2a4de9e17c6755786380460