Merge "Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402 am: 596c22a8 am: 07b212b7"