[automerger skipped] Merge "Migrate getSimStateForSlotIndex to...

[automerger skipped] Merge "Migrate getSimStateForSlotIndex to TelephonyManager" am: 51c68aaa am: 6a67ac0b am: 17e5b983 -s ours

am skip reason: Merged-In If654ac4ef65b5be3cda99cbfd8694e4027fd4d65 with SHA-1 e161df7f is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2481148



Change-Id: Iab26ae4821f50170cc758bb15f82107b35b4cb2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>