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

[automerger skipped] Merge "[Cherry-pick] Revert^3 "Revert "Load native GLES driver when specified.""" into main am: 287b271d am: 1eeacf0e am: 80adbb6d -s ours

am skip reason: Merged-In Ibcf9d765ce1bd8931859d1c11e849a311adda172 with SHA-1 943252cc is already in history

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



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