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 am: 31ce88b1

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



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