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

Change-Id: I89e594f1e8ce3dc6b8437fcd5365cad624d73db6