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: f046fedf am: d48bed85 am: f1aeb07d

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



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