[automerger skipped] Merge "CCodecConfig: map KEY_HDR10_PLUS_INFO to...

[automerger skipped] Merge "CCodecConfig: map KEY_HDR10_PLUS_INFO to C2StreamHdrDynamicMetadataInfo" am: 068659a5 am: 44689f48 -s ours

am skip reason: Merged-In Id62fab8eea28712084a7c39fe7db2da193481ded with SHA-1 65b9be69 is already in history

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



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