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

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



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