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

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

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