Merge "Fix and deflake ConnectivityManagerTest"