Ensure necessary reboot to happen in tests

In one case, if failure happens during the preparation, fail the test
after the reboot.

Bug: 279127811
Test: atest odsign_e2e_tests
Change-Id: I42c68254dd4d0060de01e3e5fd7b0b5a4f13df3b
2 files changed