[automerger skipped] Check INVALID_SIM_STATE for sim permanent lock status am: e5bf3a268e am: ace893bc48  -s ours
am: ab0422450d  -s ours

Change-Id: I798c07b111ce10e506cf06a319d65553b4ebc5cf