[resolved conflict] codec2: add missing C2StreamHdrDynamicMetadataInfo am:...

[resolved conflict] codec2: add missing C2StreamHdrDynamicMetadataInfo am: 2d222b8f am: 0387b105

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



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