Merge "Fix crash when failing to parse test discovery output" into main am:...

Merge "Fix crash when failing to parse test discovery output" into main am: ba8b8674 am: 5b2f23bb

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



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