[automerger skipped] DO NOT MERGE Always query ICCID from Uicc for locked SIM....
[automerger skipped] DO NOT MERGE Always query ICCID from Uicc for locked SIM. am: 1293973a -s ours am: 33d275a1 -s ours am: 97a3ef4d -s ours
am skip reason: Change-Id Ib46138acd63233332d300b2210bf7634f1da1868 with SHA-1 1293973a is in history
Change-Id: I36ef07b5c1d7627476591563123bc9d19966c2a6