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

Change-Id: I0e8e3c80951b142d701cda7252e72fb1db019396