Merge "Change to <product>-<release>-<variant> form" into main am: f1d6cefbe0

Original change: https://android-review.googlesource.com/c/platform/development/+/2817176

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