Telephony: Dialpad key padding [3/3]

Change-Id: I2a03ca56fd2cb961af25d3af7940fce2c77b6054

Conflicts:
	res/values/slim_arrays.xml

	modified:   res/values/slim_arrays.xml
	modified:   res/values/slim_strings.xml
	modified:   res/xml/call_feature_setting.xml
	modified:   src/com/android/phone/CallFeaturesSetting.java
Merge remote-tracking branch 'upstream/kitkat' into kk44