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

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

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



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