[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: 7732c13b am: c859188c -s ours

am skip reason: Merged-In Idb66f290801de1ef777c909be7b582703fe7e144 with SHA-1 e059399b is already in history

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



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