Backport of incremental correctness fixes to patch branch#39967

alxhub wants to merge 3 commits intoangular:11.0.xangular/angular:11.0.xfrom

alxhub:ngtsc/bug/correctnessalxhub/angular:ngtsc/bug/correctnessCopy head branch name to clipboard