Merge "Generate product variants by default" into main am: ce12ea8f am:...

Merge "Generate product variants by default" into main am: ce12ea8f am: dead374d am: 955b3806 am: 3b5053ee am: 80a0b71e

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



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