kill app long press back

Moved into Extras

mbc596
Revert "kill app long press back"

This reverts commit 72f7a3b18101ba4414802e0ca79faf360296c4c9.

Conflicts:
	res/values/strings.xml
Update strings.xml
Update strings.xml
Update strings.xml
Halo: Add master switch to disable Halo (2/2)

Conflicts:
	res/values-es/strings.xml
	res/values/strings.xml
	src/com/android/settings/narp/HaloControl.java

mbc596
Delete OTA
Fix translations Spanish
Volume rocker wake and volume rocker music control

Conflicts:
	res/values/strings.xml
	src/com/android/settings/SoundSettings.java
Merge https://github.com/NarpAOSP/packages_apps_Settings