Fix enrollment cancelation race conditions. am: abc127673b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16687106

Change-Id: If5fb6553ed99aefb894e00f4baf637329387d50e