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

Change-Id: I732e68d274a8d351a1b3dae13fcb85b1ff3db8c2