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

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



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