Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""