Merge "Rename phoneId to slotIndex" am: 4e540a1c59 am: d0045fbffd am: 5b54abfa84

Change-Id: I59bf3ec187cb59d17860b85ad5cead58fc1017c0