[automerger skipped] Merge "[Cherry-pick] Revert "Revert "Load native GLES...

[automerger skipped] Merge "[Cherry-pick] Revert "Revert "Load native GLES driver when specified.""" into main am: ecc40143 am: 2fdac98f -s ours

am skip reason: Merged-In I6a2e716d340d9be3610c31abbcbe7984bf472f9f with SHA-1 8968823a is already in history

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



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