[automerger skipped] Improves PIN/PUK handling events in keyguard am: 4b2f6e2816
am: 9ccf27545f  -s ours

Change-Id: I9c288590093d047f04d015c77e485c52ee2ea1ce