[automerger skipped] Fix bt2020 linear ext mapping issue in EGL and Vulkan. am: 8eb16576 -s ours

am skip reason: Merged-In Ifd68cc10afc0b5b38b15af2a938d02bb3bcd3764 with SHA-1 03a1a752 is already in history

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



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