Revert "[2/2] Frameworks: HALO - rebased"

This reverts commit 51eb86abaa03af2cc9d41ef43cdd0d90283da588.

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/res/values/dimens.xml
	packages/SystemUI/res/values/pa_strings.xml
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	services/java/com/android/server/NotificationManagerService.java

Change-Id: I0490742ade949577c0a979e8c28c3a1cf44ace41