base: Keyguard: correct usage of lock delay on end call

http://jira.omnirom.org/browse/OMNI-793

Change-Id: I32222a62bec05c4c99ac3039bf7aa983fccb6020
Merge remote-tracking branch 'omni/android-4.4' into omni-4.4