Merge "Allow EAP-SIM authentication methods under PEAP" am: e690e0178c
am: 549c3fc0da

Change-Id: I35592cd0e25bf459505c0a2008b7fe1f3be6298c