Revert "Revert "Fix enrollment cancelation race conditions.""

This reverts commit f4dc031e6c25e01de5efad59e6baf482abc9dd91.

Reason for revert: Reapplying with additional change to fix the issue that broke HIDL clients.

Change-Id: Idd1485f182cf841b96ced1dab4b8330ff3b57c2a
30 files changed