Settings: Add cLock settings back to lockscreen settings

Change-Id: I00153e63e39e312b5ff097a4e651f2bbf33d7b4b
(cherry picked from commit 884f76116def3d95dca46f4fb2e749e50a27ac41)
FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
(cherry picked from commit ad11a18e235884bab07a40ef26e233fe85f9be83)