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

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/liquid/HeadsUp.java

Change-Id: If1311256b57d47fcdd627cadd6349627dc6507ad