Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev
am: ef98275635  -s ours

Change-Id: Icf1ff0d9ed2ee86728960f3349762275020f8f10