Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager"" am: 5f433550 am: e4157c3a

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



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