[automerger skipped] Merge "Revert "[DO NOT MERGE] Revert "Migrate getSimStateForSlotIndex t..."" am: ee6492fc5b am: d92a93e71c am: ea013bcc1c -s ours
am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2485127 Change-Id: I6626bec74e1daff34920c2f527df6320135702c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: