[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: d93418c1 am: a488ba34 -s ours am: 0aced36f -s ours

am skip reason: Merged-In I03a662186d386764c9b0dd2b9d8d5ada93823dda with SHA-1 f927f9b5 is already in history

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



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