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

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



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