Merge "Fix unlock jank - send `forceIfAnimating` only for biometric unlocks"...

Merge "Fix unlock jank - send `forceIfAnimating` only for biometric unlocks" into udc-qpr-dev am: 0eb2be8b

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



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