Revert "[2/2] Telephony: allow disabling call end sound"

This reverts commit d70bb98754075aa80dc4df2ef585fb38d1386d9c.

(cherry picked from commit c80dc7d95f2f4e9a0e70e4d28abba7367ecb13c7)

Conflicts:
	res/values/cr_strings.xml
	src/com/android/phone/CallFeaturesSetting.java
Revert "[2/3] Telephony: allow disabling non intrusive incall ui"

This reverts commit 23dbc103788027a64949356311eaed79137a4389.

Conflicts:

	res/values/cr_strings.xml

(cherry picked from commit ef64c5a74fe42d04d74a0f98a6c88ffc3fbbec4f)

Conflicts:
	res/values/cr_strings.xml
	src/com/android/phone/CallFeaturesSetting.java
Telephony: Incoming Call in Background (2/3)

Patch ported from 4.2 which was done by our lovely HCP. A
very popular one so we bring it back and adapt it to 4.4

Allows user to set that Incoming Call UI will remain in background
if screen is on. Instead, a notification is added to StatusBar, which
can be used to bring up the Incoming Call UI. Ringtone and vibration
still occur as per system settings.

This has the same effect as apps marked as "immersive". It prevents
the incoming call from backgrounding the current activity.

PS: reorder settings a bit

Change-Id: I159bd817ebcc39a0733f9433feb29b310adbc2aa
(cherry picked from commit 5d174e1c6a362403ccc1aa56922c31b1a817a8f3)

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