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

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

Change-Id: If32f80dbfcba1b1db5e379687413c439d0684aa8