[automerger skipped] Merge "Include inserted pSIM (possibily inactive) in...

[automerger skipped] Merge "Include inserted pSIM (possibily inactive) in available sub list." am: 6c6ce8ad am: 4555adf0 -s ours am: f2b7fc44 -s ours am: 7c05bdce -s ours am: a6ee2b13 -s ours

am skip reason: Change-Id Ic5b5396e3bba43005f46eb8af7720355c10c240a with SHA-1 cc85638f is in history

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

Change-Id: I5d37c36739bf852ea7b2ee60ebe17bd9835767bb