Merge "Enable Soong's tradefed_binary to support multi-arch" into main am:...

Merge "Enable Soong's tradefed_binary to support multi-arch" into main am: 453afad7 am: 36a49910

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2849275



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