[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: 25f82c5e am: 9e91feec -s ours

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

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



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