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

This reverts commit c6771cb8a5153e1f26ef13acaea83f55733c8a88.
LN : default OFF