When doing activity->activity transfer, use abort instead of finish

Otherwise, it can be interpretted as an accepted merge.

Bug: 222109476
Test: monkey
Change-Id: Ia5a2259c7ba2909cce14f0a5be63517557eba2d8
1 file changed