(2/3) Frameworks: Dialpad key padding

Conflicts:
	core/java/android/provider/Settings.java