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

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

Change-Id: If7b0f2d76154c20de8010efcda2a7731a1976be2