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

Change-Id: I6d191528362535f5965d4e0960f4f5631da01a3e

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java