Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager"" am: 66c41b3215 am: 2acdae9db7

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2484177

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