Merge "ConnectivityManagerTest: clean up when connectToCell fails"