Revert "HALO cleanup"

This reverts commit 0d68c32db6660f69fee2546dfc2bc5b822012192.

Signed-off-by: PipelinerArd <kristoferard@gmail.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/halo/Halo.java