Merge "Add callback for when enrollment state changes" into sc-qpr1-dev am:...

Merge "Add callback for when enrollment state changes" into sc-qpr1-dev am: ada5e056 am: 1b28a2e7 am: 605ee86b

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

Change-Id: I940034fb791e28e6b455f8890d0980fe619117f8