Fix lock screen timeouts

- Currently, if slide lock delays are enabled and then user switches to a secure lock screen, the slide delays were still being utilized
- This patch fixes the logic around whether to utilize the slide delay setting

Change-Id: I44d8b8dcb04468ca069c7967a753038090d34133
Merge remote branch 'cm/cm-10.1' into cm-10.1