[automerger skipped] Merge "SdkTestCore for non-updatable modules" into main...

[automerger skipped] Merge "SdkTestCore for non-updatable modules" into main am: af1c9299 am: 2d7bb94e -s ours am: a31c95ab -s ours

am skip reason: Merged-In Iba3213e8c34ea75ac9dd8532a95ef62fb5455e6c with SHA-1 9421c4ce is already in history

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



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