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

[automerger skipped] Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..." am: 244f3180 am: 5889308f am: 5486617c -s ours

am skip reason: subject contains skip directive

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



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