Merge "Convert merge_annotation_zips_test to b test" into main am: 91ad7f2e...

Merge "Convert merge_annotation_zips_test to b test" into main am: 91ad7f2e am: 186c98ca am: 70aa28a7 am: ffb9e36b

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



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