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 branch 'kitkat' of github.com:AOSPA-legacy/android_frameworks_base into kk4.4