Improves PIN/PUK handling events in keyguard
am: 4b2f6e2816

Change-Id: I8358bc35d236e47aeb716d2764c3e1db995e25f8