Revert "Halo: Add master switch to disable Halo (1/2)"

This reverts commit 9d667ed47bf48cec26e8aa3598b0b4d6f600ef2b.

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

Change-Id: Ibb9a832f827f3968e42e30647cbd59c755c00b65