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

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

Change-Id: I10fdaec0318f85edfcbbffb71926e033954f8aca