am a8606cf6: am 398f80ea: Merge "Fix 5620754: don\'t show pattern screen after SIM PUK unlock" into ics-mr1

* commit 'a8606cf661fde3300165f181c5825cf0535adc66':
  Fix 5620754: don't show pattern screen after SIM PUK unlock