Show connected WiFi network in notification drawer 2/2

Change-Id: If604555bdc630efa8d21019388c95bb9aecee13a

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java