Merge "Only report tryTest errors when not caught" into main am: 739a6c4320 am: a75afa3338

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3382164

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