[2/2] Telephony: Non-intrusive InCall UI switch

Change-Id: I545121334ffb2925a05a8c7685b84bb5df37c205

Conflicts:
	res/values/custom_strings.xml
	res/xml/call_feature_setting.xml
	src/com/android/phone/CallFeaturesSetting.java
3 files changed