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

am skip reason: Merged-In I5189042efc41fa7bef06d20f43ed4da3b1271dab with SHA-1 0a14c642ec is already in history

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

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