[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: 31ce88b1 am: 475cc2a7 -s ours

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

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



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