Settings: Notification Shortcuts (2/2)

Conflicts:
	res/values/arrays.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/xml/notification_drawer_settings.xml
	src/com/android/settings/Settings.java

Change-Id: Ifba8ede863922fcd7a1636c5f1a96267fd092117