Show Trivy and Grype under GitLab in the security report Tool filter

Why is this change being made?

In a recent MR the Scanner Vendor for Trivy was updated to Aquasecurity. While this is technically correct, it had an unintended consequence of showing container scanning results under the wrong Tool heading.

This MR reverts the change for Trivy and fixes Grype, which already had the same issue.