Merge "Fix up EAP-SIM documentation" am: 2142b14a88 am: 32655dfa19
am: 5e10f3d8e3

Change-Id: Idecbc5f6e85c35c8f648dda005d701bf4ebdec82