Merge "Don't trigger active unlock on udfps-down" into tm-dev am: ea4839b80c am: f046fedfe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18350522 Change-Id: I5cfb86e8dcb9163c9491d75931edad26ab3986ad Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: