Fix 2-level task to 1-level task (2/2)

Fix remaining tests to use 1-level task.

Bug: 155824575
Test: atest RootActivityContainerTests
      atest TaskStackTests
Change-Id: Ib2e9ceb377e1232781760f2cb1a5cdf02ef315fb
2 files changed