Merge branch 'default-to-60-days' into 'master'

Fix an intermittent add_on_purchase finding issue with duo trials

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



Merged-by: Alper Akgun <aakgun@gitlab.com>
Approved-by: Roy Liu <rliu@gitlab.com>
Approved-by: Alper Akgun <aakgun@gitlab.com>
Reviewed-by: Alper Akgun <aakgun@gitlab.com>
Co-authored-by: Doug Stull <dstull@gitlab.com>