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

Change-Id: I54c07211dc121117543ccb8a4799efa491e5a469
Signed-off-by: scott <scott@ubuntu>

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

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
this is candykat. thanks omni

Change-Id: I4b7b0986a978a85d87e9991e084a7bac4925891a
rename strings

Change-Id: Ia2f3adf3a915f01c880113440513e7277eda40b9