Make incoming call screen style configurable (3/3)

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

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java

Change-Id: I0ed709613a1e451d5b5ce68b7c5575f6e0de24a5