Fix home/menu unlock with long press hardware key

- Forward port of commit 2a572ee7587cb0b686871e95567313aa8bc8bfd5

Change-Id: Ic2eb85542f8052fe1662244fe5e72ba12a98608b
Keyguard: Fix for home wake/unlock sometimes waking and unlocking during the same keypress.

Change-Id: I72ea7611d39aac0cd03dfd5aa7036aeef7600140