Merge branch 'issue_410281_ff_storage_expiry_fix' into 'master'

Account for end date in additional_purchased_storage_size

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121048



Merged-by: Kamil Trzciński <ayufan@ayufan.eu>
Approved-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Approved-by: Kamil Trzciński <ayufan@ayufan.eu>
Reviewed-by: Kamil Trzciński <ayufan@ayufan.eu>
Reviewed-by: Vijay Hawoldar <vhawoldar@gitlab.com>
Co-authored-by: Suraj Tripathi <stripathi@gitlab.com>