Merge "Add getSlotsMapping to TelephonyManager"