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: 602c9df2 am: b3eeff3c

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



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