Add more userspace reboot + apex update failures scenarios

Since I was there, made sure that test cases clean up state after
themselves, and removed invalid test case.

Test: atest apex_rollback_tests
Change-Id: Iaef838a22a005f32c1457e5ae711bb86b7608ea3
2 files changed