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

Merge "Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b8 am: f046fedf am: c4fb8dfb" into tm-qpr-dev-plus-aosp am: 74fa2f64

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



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