Merge "Improve error reporting in ConnDiags tests" am: 01aa602a3f am: 78a9b27ca5 am: 252558dcdd am: 5c4ffb5c36

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

Change-Id: Ied6239f2c24eee334c1adaae4d39fa6074bb1e80