[automerger skipped] libstagefright: Fix HDR profile mapping am: 14811c34 -s...

[automerger skipped] libstagefright: Fix HDR profile mapping am: 14811c34 -s ours am: ddedfb6f -s ours am: b27bbb93 -s ours

am skip reason: Merged-In Ia4a901c319f5e0c7361d0ba921dec9db5d9ca2ae with SHA-1 2709cf7f is already in history

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



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