Make incoming call screen style configurable (3/3)

Change-Id: I9ee4388214cddd93f045324323a93c3af79ec4fd
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_services_Telephony into cm-11.0

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
IMS: Only enable IMS calls if IMS service status shows enabled

Change-Id: I9bd4ce17a62dcf188989dd79dc9deaa78e491fa6
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_services_Telephony into cm-11.0
Automatic translation import

Change-Id: I2303f2b924d38b2451b63f41c021a72b04b8a0ad
Telephony: Heads up meets SlimKat....SlimKat meets Google IO [3/4]
Add heads up setting for the native integration in dialer

Enabled by default

PS
- derp

PS
update commit message header

Change-Id: I0a540f2dc2667d572797a68c07b6eb471653ec16

Conflicts:

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

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

Change-Id: I2cba8229d0f1efb24513bb8a7e29c0f13d9ef31c