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

[automerger skipped] Merge "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex to TelephonyManager"" am: 5f433550 am: e4157c3a am: bca81f5c -s ours am: 3473c96d -s ours

am skip reason: subject contains skip directive

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



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