Merge "Add interfact to get phone ID from UiccSlotInfo" am: 909e9d3e49 am: feba71b4ef
am: 0f804fa225  -s ours

Change-Id: Icf724111cd0848ea072980ba022ed4654b5ecf4e