[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-qpr-dev am: 44d19005 am: e189373a -s ours

am skip reason: Change-Id Idaa872778afc13e86bdea918da8631b4747fe9c1 with SHA-1 49d87e5c is in history

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

Change-Id: Ic4ff9b8a7104d10bdf30b36a34a11096646e5e4f