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

Change-Id: If3dfcac1f8a4a46231f428aebc14f98ee16bc4e2