[automerger skipped] Merge "Add TelephonyManager APIs to take physical slotIndex - getSimCardState - getSimApplicationState" am: 4ed6876df1 am: 3e837c4822 am: 38e5aa08d0
am: 00c3767ce2 -s ours
am skip reason: change_id I72612afb9f8ff3d898db99afaaee0c0d3654f754 with SHA1 f7f87dd1c9 is in history

Change-Id: Id695d1cf8fdcb13c69b0693a7ac5830b5c804b7e