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

[automerger skipped] Merge "Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..."" am: e448dcf3 am: 36ec1ace am: 3a15f4bc -s ours am: e35e4bc8 -s ours am: 5b817e17 -s ours

am skip reason: subject contains skip directive

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



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