[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: 9cdcae0d -s ours
am skip reason: Change-Id Ib46138acd63233332d300b2210bf7634f1da1868 with SHA-1 e41d70fc is in history
Change-Id: Iee9430093997f9991d29563cec77cd6297e9fcf1