Merge \\"Don\\'t save the anonymous identity for EAP-SIM/AKA/AKA-Prime\\" into nyc-mr1-dev am: 015c8a3ac0
am: 48a2b01de0

Change-Id: I2f0ead049896e67e9513340cd08443927a40542c