Revert "Heads up: option to disable in lockscreen (2/2)"

This reverts commit 6770f4fe283fe148bd2567432ba25c1510b70501.

Conflicts:
	src/com/android/settings/slim/NotificationDrawerQsSettings.java
Heads up exclude from lockscreen in new location