Merge "Bp2build product variables on non-arch-variant module types" into main...

Merge "Bp2build product variables on non-arch-variant module types" into main am: f768e6e2 am: ed5e34b7 am: 9299a3c5 am: 3cf64d7f

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



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