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

Change-Id: I3f61bdd86c97210acd14b6d2d30e44e26c8b1085