fix msim derps

Change-Id: Ieb2727567f4daf45fc4037f840f313a532cbbd6b
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 'PA/kitkat' into remix-legacy

Conflicts:
	packages/SystemUI/res/layout/signal_cluster_view.xml
	packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java