Revert: fb: Add Wifi name to notification drawer when Wifi is connected

compared to 4.3 we do not make this optional any more. If it is connected
it will show up in the notification drawer permanently and behaves same
like the carrier label

Change-Id: I058b6de4e546b4fa9b9cfef6c765664e135de2e2

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java (reverted from commit d1af45736ed2dbd927bdb2a2e9795384799c7378)