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 am: 52c5f2d0

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



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