[automerger skipped] Merge "Correctly expose EGL_ANDROID_native_fence_sync to...

[automerger skipped] Merge "Correctly expose EGL_ANDROID_native_fence_sync to hwui" into rvc-dev-plus-aosp am: 6078830f am: 8323c72f -s ours am: b0f6fa2f -s ours

am skip reason: Change-Id Idaa872778afc13e86bdea918da8631b4747fe9c1 with SHA-1 665f91bd is in history

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

Change-Id: I943f168c1342c21fadae8ee3c3fcb793c278be8e