Revert "Fix another derp in Lockscreen Notifications Settings"

This reverts commit 3dc342ed78053e58bf2df7302cb13751d73b664e.
Revert "Lockscreen: Notifications: Fix for devices without proximity sensor"

This reverts commit 8a5dce99688858c5bd04da7a8d2e5172e96b18dc.
Revert "Try to fix settings FC"

This reverts commit 747cba1c0df431d282a46f56de506c8c8b31c78d.
Move Notification Options On One Place