string edits

Conflicts:
	packages/SystemUI/res/values/slim_strings.xml