Revert "HALO (1/2)"

This reverts commit 0a9c812704953e2a63f8acdf5b7501049112ef85.

Conflicts:
	core/java/android/app/Activity.java
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java