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

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



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