reorganize lockscreen settings

Change-Id: I9cd8d4d2265769c78e9d6a11f5dfec3faed4a202
fix

Change-Id: Ia6dec44e5e20e2369b08a36a70a8520cba4406fa
fix

Change-Id: Ifb2ffbdffd27356ceab7dd8a859d2e559f74bce7