[automerger skipped] Merge "Merge "MediaCodec: Add HDR format metrics. Modify...

[automerger skipped] Merge "Merge "MediaCodec: Add HDR format metrics. Modify HDR metadata metrics." into tm-dev am: bf6142c4 am: a3805aa8" into tm-d1-dev-plus-aosp am: ce6d1268 -s ours am: 7b960a05 -s ours

am skip reason: Merged-In Ib34a6603c4b2a2fbd57e8ca1666a470ba87783ff with SHA-1 3e237706 is already in history

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



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