[automerger skipped] Cherry-picked "Hide SIM PIN when SIM card is removed" to pi-dev am: 0b196c693b
am: 806e8cdc9e  -s ours

Change-Id: Ic87c006460633705259328fdb9ce07817ac80a7e