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: a1ac0c83

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



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