Telephony: revert Omni's non-instrusive [3/3]

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

This reverts commit 8fceba69982246f70f1bec40dd13063aaeb24cae.

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

Change-Id: I83e2bc729fcc0598edf33d2aa6af294e17b9723e