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: I416d22ffbb3ce6ea18532ae34a86d8b5f62d78e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>