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

Change-Id: Icee9024e855c84ad851401ac6038d91027e914d4