Cherry-pick #3784 into an 8.0.9+1 release

[srawlins]

The flutter roller is blocked and needs the fix in #3784 (14d33d3) released. Rather than cut a release with unrelated changes (with potential bugs), I'm cutting a cherry-pick release. This avoids ~10 commits between 8.0.9 and 14d33d3, and ~14 commits that have landed since the fix.

---

• I’ve reviewed the contributor guide and applied the relevant portions to this PR.

Contribution guidelines:

• See our contributor guide for general expectations for PRs.
• Larger or significant changes should be discussed in an issue before creating a PR.
• Contributions to our repos should follow the Dart style guide and use dart format.
• Most changes should add an entry to the changelog and may need to rev the pubspec package version.
• Changes to packages require corresponding tests.

Note that many Dart repos have a weekly cadence for reviewing PRs - please allow for some latency before initial review feedback.