Simplify canceling the bond process

Bug: 145171640
Test: compile & try cancelling a bond
Change-Id: I0f35199104e203c2477c4091f2e46826b769ee31
2 files changed