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: 42f5052b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2797163



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