Merge "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager."" am: 1f568c14ac am: b91d1b3e3a
am: b5928a2b81  -s ours

Change-Id: Ia781d4799c9b4df316a9617055f99dbdf3e51a30