Merge "Remove unused import in ConnectivityManager"