Merge changes from topic "import-sdk-version-none" into main am: a815d9bf...

Merge changes from topic "import-sdk-version-none" into main am: a815d9bf am: bd9bd6b2 am: 81fcb1be

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



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