Revert "LockscreenNotification: update default value"

This reverts commit 2b0bd8f4dd6536695bdeb640ca2c8313d85e6928.
Revert "Bring back Lockscreen notification (2/2)"

This reverts commit cfcca6e21b607a554d03ae7e6756b1b0d858dc9b.

Conflicts:
	src/com/android/settings/DisplaySettings.java

Change-Id: I970e7650f80d006f3929595aa0e50c78bbd29a42
fix derps due to last change

Change-Id: Ic559291bac979e245d86719d50727f7803bea67a