[automerger skipped] Merge "Fixed SIM issues" am: 86c9ce50 am: d920cd2c am: dbcb0830 -s ours

am skip reason: Merged-In I3a9c901443e1aa85edd289f3b0d41ab9b19dc2f1 with SHA-1 eb223233 is already in history

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



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