Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 14d6ef4509
am: 885978728f

Change-Id: Ied19e4e746f5b22e37d9078f72b84d7f4d7fd72a