Revert test changes for post startup methods change

Test is still flaky.

Bug: 63635729
Test: test/run-test --host 595-profile-saving

Change-Id: I77d40fcd033869e3f5396e6824255856276f5812
2 files changed