Merge "Fix the lockscreen height recalculation on face auth." into tm-dev am:...

Merge "Fix the lockscreen height recalculation on face auth." into tm-dev am: 519157a1 am: 687e6f13

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



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