[automerger skipped] Merge "Can switch to legacy GLES driver when ANGLE is...

[automerger skipped] Merge "Can switch to legacy GLES driver when ANGLE is system driver" am: 0a9ada5c am: 562d1f64 am: 44c2d8a5 -s ours

am skip reason: Merged-In I5383966daeea74a9d7c878c8f63f70f7fc7ccc50 with SHA-1 5279f866 is already in history

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



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