Merge "Support EAP-SIM and EAP-AKA" into lmp-dev