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

[automerger skipped] Merge "[Cherry-pick] Revert "Load native GLES driver when specified."" into main am: f7de85cd am: 9b90fc0b -s ours am: f75b4d41 -s ours

am skip reason: Merged-In I785d2d3ff8dd21a1a207ccd814b5dddb080e9b52 with SHA-1 1d626138 is already in history

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



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