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

Change-Id: Icbc6fba1727c009f7ea42a66ea3167f19d527e10

Conflicts:
	res/values/cr_strings.xml
	src/com/carbon/fibers/fragments/sb/HeadsUpSettings.java

Change-Id: Ie8b569b4fe6cb52768a63938dcb8772c4965fb7d
Merge branch 'kk' of github.com:twwolk/android_packages_apps_CarbonFibers into kk