Merge "Treat SIM state LOADED same as READY for PUK progress." am: a3a2743beb
am: 08d52db5ef

Change-Id: Ie0df57db3ed8f5bde025afe54e4b0b023dc6cf71