Revert "Telephony(MSIM): Integrate AOKP statusbar features & bug fixes"

This reverts commit 3ab4d77d7ef13575e63c546997a3825848580e88.
Notification ShortCut : Fix Carrier Hide

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Fix WifiLabel NPE