[ToA] Fix suggestions in previous change.

Bug: 314886712
Bug: 314886661
Test: manual + Presubmit
Test: atest GrammaticalInflectionManagerTest
Test: atest WmTests:ActivityStarterTests
Test: atest WmTests:WindowProcessControllerTests]
Change-Id: Ic3fcba991f057e3274dc9166eff099da0844e9af
3 files changed