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

[automerger skipped] Merge "Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..."" am: ee6492fc am: d92a93e7 am: ea013bcc -s ours am: c1dfeb34 -s ours

am skip reason: subject contains skip directive

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



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