Merge "Add getSlotsMapping to TelephonyManager"
am: 600827273c

Change-Id: I7eace0e5cc7cd3f58cdddde3837a7c8b714e08ba