Merge "Don't crash ConnectivityService#dump"