Merge "Fix 5636798: clear PIN/PUK fields when device sleeps or user cancels" into ics-mr1