[automerger skipped] Merge changes from topic "getSimStateForSlotIndex" am:...

[automerger skipped] Merge changes from topic "getSimStateForSlotIndex" am: 08b4e486 am: ff084560 am: 5cb83982 -s ours am: c43ad0b8 -s ours

am skip reason: Merged-In Ib9b23312f73a5c2bdefd2a770ef0b6c848a7d387 with SHA-1 80b86fa2 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2481080



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