[automerger skipped] Merge "Make sure to show inserted pSIM in Settings by...

[automerger skipped] Merge "Make sure to show inserted pSIM in Settings by trimming the 'F' in iccid." am: 8887f62b am: 1128fb38 -s ours am: 927a06d9 -s ours am: 16976171 -s ours am: 8ce30976 -s ours

am skip reason: Change-Id Ieeee61ba968ac9f23b355cca52374659a6cdf77f with SHA-1 03d293cf is in history

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

Change-Id: I44c602fad5080e548b8ed71b329a53cde8b6f22f