Merge "Fix build configuration dependant Soong test" into main am: de88e350

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



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