[automerger skipped] Merge "Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..."" am: 29568a11c1 am: 725b9307d3 am: e6f5e74a65 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2485128

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