Merge "Use phoneId instead of SimSlotIndex" am: 56b3d75967 am: 3afc834432
am: 723b4ecaf4

Change-Id: Ie4622425fb0875db04c2b0bee54d4fd8d3a514e7