Reland bug for flutter/engine#47992
Reverted in flutter/engine#48004

This was reverted because it caused a lint failure in post-submits, even though pre-submits were fine.
Example: https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8764499304217307697/+/u/test:_test:_lint_host_debug/stdout