Byzantine-resilient Federated Learning With Adaptivity to Data Heterogeneity