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

Change-Id: I49a375508824696b3f362bce720a296d85a084aa