Merge "Fix a flake in ConnectivityDiagnostics" am: 1ac3e27399 am: 79b4f30495 am: 4fbdc30d3e am: 3811b0eef4 am: 631acdeff0

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

Change-Id: Ibe9cb66e91d71014033751a891bf4d337b0f0e87