Merge changes from topic "go-test-bp2build" into main am: a11df791 am:...

Merge changes from topic "go-test-bp2build" into main am: a11df791 am: 609b36af am: f6eca2f7 am: dc877a57 am: bd3500ad

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



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