Merge "Add phone ID into UiccSlotInfo." am: 52d2884d10
am: f8bbd75af2

Change-Id: I27a4ade41ab3d3ee96c5c016e4b66a98f57d5c1a