Code cleanup: StagedRollbackTest (3/n)

Rename and group device methods together that belong to the same host
side method.

Bug: 142697546
Test: atest StagedRollbackTest
Change-Id: Iec49c141ef2b6c99c3a395c5287af562ee975942
2 files changed