Merge "Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..."" am: 29568a11c1

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

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