HALO (2/2)

Conflicts:
	res/layout/installed_app_details.xml
	src/com/android/settings/applications/InstalledAppDetails.java

Change-Id: I568233608cfccf1af69846b95e896deff8e13c07
Fix typo and added missing strings.
Settings now really saves changes to Halo behavior.
HALO: Option to pause the underlying app (2/2)