https://github.com/angular/angular/pull/36133 and https://github.com/angular/angular/pull/35986 caused a conflict in test after they both got merged to master. This PR fixes the failed tests. PR Close #36169
https://github.com/angular/angular/pull/36133 and https://github.com/angular/angular/pull/35986 caused a conflict in test after they both got merged to master. This PR fixes the failed tests. PR Close #36169