Merge "NonBypass - enter device if user is attempting udfps auth" into sc-dev...

Merge "NonBypass - enter device if user is attempting udfps auth" into sc-dev am: ec1a26e3 am: 52bb2777

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

Change-Id: I0bd355f7d59a8d1da6965ee085a5057282ddb1a6