Merge "Have isValidPhoneId and isValidSlotIndex based on activeModemCount."
am: 300a0262b9

Change-Id: Ic2686d75c094272a2703df0c2e0516ee9b5acbec