Improve async handling in generated code#18783

apeeters wants to merge 2 commits intoangular:masterangular/angular-cli:masterfrom

apeeters:fix_asyncapeeters/angular-cli:fix_asyncCopy head branch name to clipboard