[automerger skipped] Merge "Modify hdr metrics" into tm-qpr-dev am: 7e7976d0...

[automerger skipped] Merge "Modify hdr metrics" into tm-qpr-dev am: 7e7976d0 am: d2a00a97 -s ours

am skip reason: Merged-In Ib000bb6a50e68f16dda89455cb481a2aa0721ace with SHA-1 91f934dd is already in history

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



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