[2/2] Settings: Lockscreen Setttings

Change-Id: I4323f42646a02e5276fdbe18a702aa858781fec2
Merge "[2/2] Settings: Lockscreen Setttings" into android-4.4
Merge remote-tracking branch 'omni/android-4.4' into android-4.4