Merge "Dismiss keyguard on udfps touch if can dismiss LS" into sc-dev am:...

Merge "Dismiss keyguard on udfps touch if can dismiss LS" into sc-dev am: 45877fb8 am: 6605f0d1 am: b18922a1

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

Change-Id: I6630c4e83649f554cf13b711ad7075b46813e4a8