Merge "Skip soong tests in multi-tree" am: 430b51a66e am: f15754c527

Original change: https://android-review.googlesource.com/c/platform/build/orchestrator/+/2482736

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