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

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java

Change-Id: I54c07211dc121117543ccb8a4799efa491e5a469