Merge "Fix flake in ConnectivityDiagnosticsManager" into main