Merge "Remove SdkVersion condition from image variants" into main am: 098743d0

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



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