Merge "Add ignoreEnrollmentState to prompt info" into sc-v2-dev am: c9786ca681

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

Change-Id: I137effa0f4029d227be5503725d68e0b99940a53