[automerger skipped] Merge "libstagefright: Fix HDR profile mapping" into...

[automerger skipped] Merge "libstagefright: Fix HDR profile mapping" into tm-dev am: 30910c6c -s ours am: 6a2a796e -s ours am: 4133a859 -s ours am: 4bd3958d -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: I48c20f0666d8bef84b54bef832a8526be5e4316f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>