bring back a lost string

Change-Id: I0ec20c3622e1c86c6872da7bfdb43bd81edde829
Merge remote-tracking branch 'upstream/android-4.4' into android-4.4

Solved conflicts:
	res/values/custom_strings.xml