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

Change-Id: I54c07211dc121117543ccb8a4799efa491e5a469

Conflicts:
	src/com/android/phone/CallFeaturesSetting.java
[2/3] Telephony: Flip to Mute/Reject Call

Call Settings - add menu entry

PS2 - PS4: Code Cleanup

Base: https://gerrit.omnirom.org/#/c/4668/
InCallUI: https://gerrit.omnirom.org/#/c/4669/

Change-Id: Ic011c5b9e10439fc900b1302f7e07dde494b2e5b

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

Telephony: fix Flip to mute/silent

maybe fix http://jira.omnirom.org/browse/OMNI-412

Change-Id: Ie12ff6aab6ffdaf8638e0ac39f3911f7ecb8793c

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