[automerger skipped] Merge "Improve UDFPS unlock animation experience" into...

[automerger skipped] Merge "Improve UDFPS unlock animation experience" into tm-d1-dev am: b7cd296c -s ours am: 33ee3b71 -s ours

am skip reason: Merged-In I9e1fb108147ffb4c812ea2b94a50d6201eaf008a with SHA-1 24f8bdf6 is already in history

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



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