Merge "Move ConnectivityDiagnosticsManagerTest to common" into sc-dev