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

Change-Id: Ica7d71eb2884b8a7861f31902313ab8b2a713967