Revert "Fix enrollment cancelation race conditions."

This reverts commit c7a7ee892a9dbba3569ea39d2212fd8c100dc2af.

Reason for revert: Droidfood blocking bug: 213962104

Change-Id: I370cafcac7e70febbb77a05647a3fd5d0a158abd
(cherry picked from commit f4dc031e6c25e01de5efad59e6baf482abc9dd91)
Merged-In:I370cafcac7e70febbb77a05647a3fd5d0a158abd
30 files changed