Merge "ConnectivityDiagnosticsManagerTest: Raise timeout to 10s"