[automerger skipped] Merge "Correctly expose EGL_ANDROID_native_fence_sync to hwui" am: 5884555c am: 2fd8da4e -s ours

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

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

Change-Id: Ie3a965aecb5480ca50f78ce56638ad988497e41a