[automerger skipped] Merge "Codec2InfoBuilder: List HDR profiles only if...

[automerger skipped] Merge "Codec2InfoBuilder: List HDR profiles only if device supports HDR display" into tm-dev am: e492c98c am: 2a787b08 -s ours am: 18e859a3 -s ours am: 5b1dacd3 -s ours

am skip reason: Merged-In Ib6bb6af4f5bb58357e804f124521b71a08e174b5 with SHA-1 2c0fc8fb is already in history

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



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