Merge "SystemUI: show "4G" indicator for HSPA+ network"