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
Removed hide carrier label from last commit

Change-Id: Ied1312a182281b3c05210bc37fa62afe728ab885
Settings: PT-BR update translations

Change-Id: Iddfb1157ecc0fd81c45ea8cbe53e5dc195d75446

Conflicts:
	res/values-pt/cm_strings.xml
Settings: ES translations

Change-Id: I532a35857c5057e9ee0e33e79bbf9a52f39cee70