Telephony: Dialpad key padding [3/3]

Change-Id: I2a03ca56fd2cb961af25d3af7940fce2c77b6054

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_services_Telephony into HEAD

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

Change-Id: I575a0178882a88b65a0d5d2c321e79f597f84e48