[automerger skipped] Merge "Change default arch for banchan to arm64" into...

[automerger skipped] Merge "Change default arch for banchan to arm64" into tm-mainline-prod am: ddc18cf5 -s ours

am skip reason: Merged-In I31734660318eabbe3279214980b5cdecb55ab80b with SHA-1 288d4b61 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18669286



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