(3/3) Telephony: Dialpad key padding

Change-Id: I2a03ca56fd2cb961af25d3af7940fce2c77b6054

Conflicts:
	res/values/custom_strings.xml
	src/com/android/phone/CallFeaturesSetting.java