Merge "Consider the last inserted SIM for EmergencyAffordance"
am: 65d3a457d2

Change-Id: I3b7bfb3963b61c4589811e8c27e4f89ff501096e