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

Change-Id: Icbc6fba1727c009f7ea42a66ea3167f19d527e10

Conflicts:
	res/values/cr_strings.xml