Revert "[2/3] Telephony: allow disabling non intrusive incall ui"

This reverts commit d621427c42bef029abc1bd16a256a6d81ef0f63c.

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