Merge "Add getUiccSlots() and switchSlots() in TelephonyManager." am: 14d6ef4509 am: 885978728f
am: 74934cab3e

Change-Id: I707d67ac64c805e4121d31af5a491ac9e299a7c3