Kill action on Navigation bar long press back (2/2)

Change-Id: Ib1840f0ba74fce2c9e74a0035e89e75c8d7cc222

Conflicts:
	res/values/cr_strings.xml
Merge branch 'jb43' of github.com:ModdedPA/android_packages_apps_Settings into jb43