[automerger skipped] libstagefright: Fix HDR profile mapping am: 14811c34c0 -s ours

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

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

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