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
base: Tweak percentage battery icon spacing

Too much wasted space, this is better

Change-Id: Ic01fd22211ef641361d0565a8af418cc60e6e949