Merge "[Cherry-pick] Revert^2 "Revert "Load native GLES driver when...

Merge "[Cherry-pick] Revert^2 "Revert "Load native GLES driver when specified.""" into main am: d93418c1

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



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