Code cleanup: StagedRollbackTest (5/n)

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

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