Cherrypick #29783 to flutter-2.8-candidate.6

[xster]

Request: b/206892337

[flutter-dashboard]

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

[zanderso]

lgtm

[jmagman]

The luci link is missing but the Mac Unopt failure is https://ci.chromium.org/p/flutter/builders/try/Mac%20Unopt/6226.
Rebase onto #29668

[jmagman]

Rebase onto #29668

Oh never mind, this is a cherry-pick.

[xster]

I'm not cherry picking that bigger change into this cherry pick. It's a lint that failed and Mac iOS Engine has reasonable coverage. I'm merging this