Merge "Update bp2build tests to use stubbed defs" into main am: e3f7a0d4 am:...

Merge "Update bp2build tests to use stubbed defs" into main am: e3f7a0d4 am: 87a33f30 am: c5903904 am: b9180401 am: 3329ef44

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



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