In order to unblock the tree changes were made to get the cirrus tests working again but not all changes were made due to time constraints. Initial P0: https://github.com/flutter/flutter/issues/121242 PR: https://github.com/flutter/flutter/pull/121251
