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

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



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