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

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

Change-Id: I395c70b306ccc89cfccb18a4cafd6af817c814c1