Merge changes from topic "revert-2786699-import-sdk-version-none-WYNCDQGHTE"...

Merge changes from topic "revert-2786699-import-sdk-version-none-WYNCDQGHTE" into main am: 8e592ad1 am: 479e1e4f

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



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