Merge "Add interfact to get phone ID from UiccSlotInfo" am: 909e9d3e49
am: feba71b4ef

Change-Id: I4c65138fd4283c2023737c294f92d82346943157