[automerger skipped] Merge "Add getSlotsMapping to TelephonyManager" am: 600827273c am: 0ccab45a19
am: 95abfa9328 -s ours
am skip reason: change_id I416d741947b1a15e66ebf71b8104c4b2ec95e310 with SHA1 83e7b920de is in history

Change-Id: Ie36118fad789f6e9c773e700a179e100dbb1fc0d