Merge "Improve TestConnectivityManager readability"