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

Change-Id: I54dbb777059261678e47d19ea52ead6310bcbf54