Move handing of a "cancel" inside try-finally block

Bug: 3417906
Change-Id: I87e41c0cdad74e2ba72a7b4d1f059e72d106e105
1 file changed