Merge "ConnectivityManager: fix style issue"