[automerger skipped] Merge "Conditionally expose...

[automerger skipped] Merge "Conditionally expose EGL_ANDROID_get_frame_timestamps extension" am: 2b4ff836 am: c66c93e7 am: e65e1845 -s ours am: 70f8f5c0 -s ours am: 0fd0504d -s ours

am skip reason: Merged-In Id96d0c749c80ba54aa1e48dba85817efab8b7eea with SHA-1 7fee4411 is already in history

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



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