Merge "Move ConnectivityDiagnosticsManagerTest to common"