Merge changes from topic "embargo-variants" into main am: d40c4f9c64

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

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