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

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

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