[automerger skipped] DO NOT MERGE egl: Enable eglGetPlatformDisplay on Android Platform am: 517b0b214e -s ours am: 7ba835aff5 -s ours am: 3a94987b74 -s ours am: dbf0ece0f9 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mesa3d/+/13429820

Change-Id: I505110efd92c36db860bcde60e85ad80e76dc3ce