[automerger skipped] codec2: add HDR format info am: 0232e3ae am: d552e177...

[automerger skipped] codec2: add HDR format info am: 0232e3ae am: d552e177 am: fea69a54 -s ours am: 0e346de9 -s ours

am skip reason: Merged-In I00d4049d3b9067b7f6048949bcac277a56a1602d with SHA-1 04f67226 is already in history

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



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