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

Change-Id: I76bc65c45888b69d6d11611bb29847d9c4721226