Small patch for Halo [1/2]

Change-Id: I4233b58da2cc0d31e33c47ab458d074977a695be

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