Hello HALO (2/2)

Conflicts:
	packages/SystemUI/res/layout/status_bar_expanded_header.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Change-Id: I4228e6f35ab4a69d00f9c62b1e13fb18b338498d
Halo 1/2

Change-Id: I26378f538c53aa981f60d8e4828e415364910a16