Merge "Revert "Fix flake in ConnectivityDiagnosticsManager"" into main