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

Change-Id: I083778d8867e79b1a2c04166811508a6642a9c68