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

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

Change-Id: I4391c805185500b93026ec2095dc7f3f971f5775