Notification Shortcuts [2/2]

Change-Id: Ic9818eed68651f41d9cbb5d07b611b548b6111c8

Conflicts:
	res/values/attrs.xml
	res/values/custom_arrays.xml
	res/values/custom_strings.xml
	res/xml/dirtytweaks.xml