Merge "codec2: add missing C2StreamHdrDynamicMetadataInfo" am: 6089889188 am: 78b346256c

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

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