Merge "Improve error reporting in ConnDiags tests" am: 01aa602a3f

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

Change-Id: Iba9d717b4e04e7798881a376d1425b6f2e750ab6