Make incoming call screen style configurable (3/3)

Change-Id: I9ee4388214cddd93f045324323a93c3af79ec4fd

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