Support showing carrier/provider logo on statusbar [1/2]

- Added Toggle for users that don't like this feature
- Fixed icon size to match other statusbar icons so it doesn't look out of place

Change-Id: I98e70258af574ba42d0aa58853bf531e575f8d13

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
More fixes to carrier logo on statusbar

- fixed missing logo after boot
- use another way to get carrier logo
- fixed cdma missing logo problem

Change-Id: I53ccd4d65e4ae87de7908ab48caf2a5d6727c99c

Conflicts:
	packages/SystemUI/res/values/liquid_dimens.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Carrier logo: Include some more drawables

Change-Id: I3d16b80d65fe00d423e33fb9375aa43eac65fc07
Fixed a duplicate derp
Merge branch 'kk-caf' of https://github.com/BrokenOs/frameworks_base into kk-caf

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