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

Change-Id: I8515f878b22a27a1b7c5f2c0eee5ee215e19bf0d