Merge "Add .product suffix for the product variants" into main am: 251ad2f4...

Merge "Add .product suffix for the product variants" into main am: 251ad2f4 am: 0c7dd1f2 am: 808d10aa

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



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