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

[automerger skipped] Merge "[Cherry-pick] Revert^2 "Revert "Load native GLES driver when specified.""" into main am: 42f5052b am: 8fe5eee6 am: 7116a62b -s ours

am skip reason: Merged-In Id08acb6e18db095c632aa8d1a7810ede0c1a1ad2 with SHA-1 a069f032 is already in history

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



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