Revert "Bypass the lockscreen when the hardware keyboard is slid out and security mode is 'none'"

This causes issues, documented in CYAN-5567.

This reverts commit c12204450f41eb3a6175b5fae7f1a853c059c6eb.

Change-Id: Ic9478eadbfa830e869007dad17983bd33c0ac6d6
Merge branch 'cm-11.0' into kk_mkt