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

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

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