Merge "Add getSlotsMapping to TelephonyManager" am: 600827273c
am: 0ccab45a19

Change-Id: Ia14126704a30a77a173cd307a48fb3261b317b1f