Revert "PhoneStatusBar.java: Fix a derp where there was a missing bracket is gone for "if (mWifiLabel != null)" statement"

This reverts commit 0dd916928ba198537db3c552d0d081c10915ebc1.
Revert "Merge remote-tracking branch 'base/remix-staging' into legacy-staging"

This reverts commit ddb2257af0c43f6093054345ebda8c86b3b9e55e
Revert "[1/2] Notification Shortcuts by SlimRoms"

This reverts commit 4c0f79cf29f6fd49a15d858bb4c685b8b4b808f9.

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