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

Change-Id: Iaf42a2782af1a83f6e6a5fb312bcdab6d1d852f6