am dd6d1bbd: Merge "Update PUK unlock screen." into ics-factoryrom

* commit 'dd6d1bbd15c4e5cf1b3e0ac34c96f29fb04863c6':
  Update PUK unlock screen.