Merge "Fix lockscreen not bouncing up when face auth is running or locked out"...

Merge "Fix lockscreen not bouncing up when face auth is running or locked out" into tm-qpr-dev am: fb77e8d6

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



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