HeadsUp: Clean up.

Change-Id: I98f445e7a4c92a34a3d9f63e14135e92416875ff

Conflicts:

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