Revert "Heads up exclude from lockscreen in new location"

This reverts commit 60a6837813405169512d12b58ce50666a7ef2c3f.
Revert "Move heads up to its own preferencescreen"

This reverts commit c9fac78149ffd0953c32453d63c09445d0c33221.

Conflicts:
	src/com/android/settings/slim/NotificationDrawerQsSettings.java
Revert "Lockscreen Notifications [2/2]"

This reverts commit c1af85705b8f806b86c3cdf58fae2bb514237052.