Merge "Add HAL API to support conservative mode for EAP-SIM/AKA/AKA'"