Merge "Use test ([) instead of extended test ([[) in if statements" into main...

Merge "Use test ([) instead of extended test ([[) in if statements" into main am: 928378de am: 0035d64b

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



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