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

Change-Id: Ie0dcb5d7a930e0a7f8b8866e1df4e1ababe07cad