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

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



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