[resolved conflict] Merge "codec2: add missing C2StreamHdrDynamicMetadataInfo"...

[resolved conflict] Merge "codec2: add missing C2StreamHdrDynamicMetadataInfo" am: 60898891 am: 78b34625 am: 1fc73e9b am: c4b25209 am: b9f4c1c4

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



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