Merge HALO

Change-Id: If40d28080136f3027f20e188d6fd9321c78cd698

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java