Merge "Rename phoneId to slotIndex" am: 4e540a1c59

Change-Id: If220028441547c85c3540c52af9f714a15853b3a