[automerger skipped] Merge "[Cherry-pick] Make sure the correct ANGLE binary is used." into main am: eafadb3b87 am: 1aae761f25 -s ours

am skip reason: Merged-In I5189042efc41fa7bef06d20f43ed4da3b1271dab with SHA-1 277f6f95fa is already in history

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

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