Merge "Merge "Add callback for when enrollment state changes" into sc-qpr1-dev am: ada5e056" into sc-qpr1-dev-plus-aosp am: f2b9db65

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

Change-Id: I246b9455a9a631047a303682fdc38aa960fc4ec9