[automerger skipped] Merge "Always query ICCID from Uicc for locked SIM." am:...
[automerger skipped] Merge "Always query ICCID from Uicc for locked SIM." am: eedd3319 am: 30300786 -s ours am: 7fd129fa -s ours
am skip reason: Change-Id Ib46138acd63233332d300b2210bf7634f1da1868 with SHA-1 1293973a is in history
Change-Id: I3039b83895540261b80fb0d40279429435102df9