[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 -s ours am: 2da3c73a -s ours am: 5b76056b -s ours am: fefbf1fe -s ours

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

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



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