(3/3) Contact details on incoming call

Change-Id: I932714de440df471371f08f2b60be7d2bcbab2cf
Signed-off-by: kecinzer <kecinzer@gmail.com>

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

Conflicts:
	res/values/ose_arrays.xml
	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java
Make incoming call screen style configurable (3/3)

Change-Id: I9ee4388214cddd93f045324323a93c3af79ec4fd

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

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