[automerger skipped] Merge "SIM deprecated API Refactoring" am: e6190813 am:...

[automerger skipped] Merge "SIM deprecated API Refactoring" am: e6190813 am: 576daa91 am: 6e261d1c am: 0690fc4d -s ours

am skip reason: Merged-In I7356183f9f7e70475397d4ce5aa367a63013b0ad with SHA-1 e117c080 is already in history

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

Change-Id: I433115afbf6cb84b57f6c93fe9a83aca6a04910a