Return: Custom Carrier Label [1/2]

PS 3 : Fix code style
PS 5 : Rebase
PS 6 : Fix derp

Conflicts:
	packages/Keyguard/src/com/android/keyguard/CarrierText.java

Change-Id: Ic865e3c5204ab05f1e9ab0e081a54b155b577086

Conflicts:
	packages/Keyguard/src/com/android/keyguard/CarrierText.java
FWBase - 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: I9eca94e38384dde2584f2b3c4fdd4e7afdbde09d
Signed-off-by: Stefano Mura [STELIX] <ssspinni@gmail.com>

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
PhoneStatusBar: Strip '"' in Wifi name
Fix "PhoneStatusBar: Strip '"' in Wifi name"
WiFi label is not a Quote!

Cleanup the damn quotes around the WiFi label in the
notification panel. This only removes the quotes from the first
and last positions of the string.

PS 2 : WiFi name can have quotes!

Change-Id: I90badb7b2d8160e41da2632dac79042c4be37f2a

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java