[automerger skipped] Merge "[Cherry-pick] Revert^3 "Revert "Load native GLES driver when specified.""" into main am: 25f82c5e76 am: 9e91feec6c -s ours am: 35083620b7 -s ours

am skip reason: Merged-In I70b197f7b39afa52cb63cea48db274177123980d with SHA-1 f46ee64780 is already in history

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

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