[automerger skipped] Fix enrollment cancelation race conditions. am: abc127673b am: 084c7daa6a -s ours

am skip reason: Merged-In Idd1485f182cf841b96ced1dab4b8330ff3b57c2a with SHA-1 446644041b is already in history

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

Change-Id: I8342db00591d33dbb46e2f11e0977519d46274c8