Make incoming call screen style configurable (3/3)

Change-Id: I9ee4388214cddd93f045324323a93c3af79ec4fd
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

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

Change-Id: I2ca8642f97d309decf4e83d178124c2cf81645a8