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

Change-Id: I781b6e586b7925262d529056dd5f403e081a3d80