Merge "Revert "Revert "Add getUiccSlots() and switchSlots() in TelephonyManager.""" am: ec44a402 am: 596c22a8 am: 07b212b7 Change-Id: I771845c9f07aa18946c0ab99fffd2a08d888e819