auto-merger: merge in from aosp/master

Note: the api needs updating to match the 4.4.3 drop

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_dial_action_delete.png
	res/drawable-mdpi/ic_dial_action_delete.png
	res/drawable-xhdpi/ic_dial_action_delete.png
	res/drawable-xxhdpi/ic_dial_action_delete.png
	res/layout/dialpad_fragment.xml
	res/layout/dialpad_key.xml
	res/values/colors.xml
	res/values/dimens.xml
	src/com/android/dialer/CallDetailActivity.java
	src/com/android/dialer/calllog/CallLogAdapter.java
	src/com/android/dialer/calllog/ContactInfoHelper.java
	src/com/android/dialer/database/DialerDatabaseHelper.java