[automerger skipped] Merge "When disabling pSIM, make sure to trail 'F's when...

[automerger skipped] Merge "When disabling pSIM, make sure to trail 'F's when comparing iccid." am: af1e8860 am: c47bb153 -s ours am: e16bf03f -s ours am: 0dfd9dd3 -s ours am: 71618969 -s ours

am skip reason: Change-Id Ia442d216e847c9d345c993876467e0654e29bc90 with SHA-1 e2a118de is in history

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

Change-Id: I37e3e66564aada4b949e466f6fb18b19aa9b9981