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

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

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



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