Cherry-picked "Hide SIM PIN when SIM card is removed" to pi-dev
am: 0b196c693b

Change-Id: If62b7f613edbef742a08eb0f25d45dfe245fda2f