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

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



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