[automerger skipped] Merge "CCodecConfig: split input/output HDR dynamic...

[automerger skipped] Merge "CCodecConfig: split input/output HDR dynamic metadata" into udc-dev am: a6b41c29 am: e541dc93 -s ours am: 9370d0fa -s ours

am skip reason: Merged-In I7352730a9cbc988e3264b42c399db3cf8d97b13c with SHA-1 48e98a1d is already in history

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



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