[2/2] Frameworks: HALO

Conflicts:
	packages/SystemUI/res/values/dimens.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
	services/java/com/android/server/am/ActivityStack.java

Change-Id: Ie7e41d33eb5bbf80de43b7f6f595e0e8abc93d0e