Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b8...

Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b8 am: e8ac2e14 am: c651cf0d am: eb7213d6

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



Change-Id: Icd0a860e879680b263935fee65439fe1c28f2f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>