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