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

Change-Id: I0b7e760ac7abbefd4892ebd321d619e18be24b30