Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399

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

Change-Id: If68391d8131cb0d64fe7bfcfdea192fadc24d1cf