Consolidate revokeChallenge methods

Fixes: 181977689
Test: manual
Change-Id: Id26588836535f03566d93f073ef73cde946272b2
2 files changed