(4/4) Telephony: real non intrusive UI

Change-Id: If526634611e4cd6cbeb2d52116bd6c909a39fe75

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