Revert "Fix Per-App Color"

This reverts commit bf5f8050ed09891cb43b7c49126cd1bc73775e39.

Conflicts:

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