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: Ie4a7bd523342c93ca426305153ad8cc312346cae