[automerger skipped] Revert "[DO NOT MERGE] Revert "Migrate...

[automerger skipped] Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..." am: ceaf91c4 am: 473bee88 am: b6ce6b90 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2485126



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