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

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

Change-Id: I685d0dcf237a9c8549d42e63d95ce4392d4bb7f1