Revert "HALO mass commit"

This reverts commit 178f953e2d9a8d518ee9cf1acca168e4cd8335d0.

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/display_settings.xml
	src/com/android/settings/DisplaySettings.java
	src/com/android/settings/NotificationAccessSettings.java
	src/com/android/settings/NotificationStation.java
	src/com/android/settings/SecuritySettings.java
	src/com/android/settings/applications/InstalledAppDetails.java
	src/com/android/settings/applications/ManageApplications.java
	src/com/android/settings/widgets/AlphaSeekBar.java
	src/com/android/settings/widgets/SeekBarPreference.java

Change-Id: If08ec6262999edd144bde08b203cedfdf47e1584
Merge remote-tracking branch 'th/jb-mr2' into jb-mr2