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

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

Change-Id: Ia3340e3d560f66a2ec17c03488400843d4466afb