[2/2] Settings: Lockscreen tweaks

Base: https://gerrit.omnirom.org/#/c/4700/

Change-Id: Ic485195060c071f120022a52cfd85226b0c3a414
Merge "[2/2] Settings: Lockscreen tweaks" into android-4.4