Merge "Can switch to legacy GLES driver when ANGLE is system driver" am: 0a9ada5ce6 am: 562d1f646b

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

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