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

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



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