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

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

Change-Id: Iabcec5e22cec317b6f7bbca45d7a4203e81596c5