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

[automerger skipped] Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager"" am: e04304d1 am: 6fb6b350 am: 8b01285e -s ours am: 28e2f4e2 -s ours

am skip reason: subject contains skip directive

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



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