Untangle the statusbar for dual sim

This is just enough to get the statusbar to not forceclose.

TODO in future patch set:
  Implement signal text for dual sim.
  Implement hidden view for dual sim.

Change-Id: Ieeb95e3a0b1653b0e80527e1a388075654097b89
SystemUI: Only show H+ if config_hspa_data_distinguishable is set

Currently the UI is not consistent. If config_hspa_data_distinguishable
is not set you get 3G icon on HSPA and H+ icon on HSAPP.

Change-Id: I09db3a2902e30290206eafd1f64c940bab5b89e6
Merge remote-tracking branch 'cm/cm-11.0' into HEAD

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

Change-Id: I4ecb56d6a2b7e8f3d3c794799ebfbc1ddcac440f
Merge remote-tracking branch 'upstream/kk44' into kk44