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

Merge "[Cherry-pick] Revert^3 "Revert "Load native GLES driver when specified.""" into main am: 25f82c5e am: 17c86a59

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



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