Merge "Use phoneId instead of SimSlotIndex"
am: 56b3d75967

Change-Id: If7cfa3a88763b54152864ae1e3856301e1869132