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

[automerger skipped] Merge "[Cherry-pick] Revert "Revert "Load native GLES driver when specified.""" into main am: 2aa1b380 am: 8838a722 -s ours

am skip reason: Merged-In I9a01abe2f652a5dcfa5148badde8d7aa43c1a151 with SHA-1 fd23411e is already in history

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



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