Revert "fb: clean up our and AOSP code for wifi and carrier label animation"

This reverts commit 13105dbdde3f0b1fa7d66ecb5e7bb5424441ab98.

Conflicts:

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