Revert "Persist delayed calls to factory reset..."

This reverts commit 23bcae6f.

Reason for revert: DroidMonitor: Potential culprit for Bug 177391800 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: I036cb8dc912601869905aaa2a2908e395af32876