Wait for current task to complete before revoking challenge

Test: enrolled from Settings and quickly pressed the power button twice
Test: before hitting "done". The phone did not deadlock.
Bug: 136444006
Change-Id: I7e87c0722b84cde0cb96103f6b94535ca3a96798