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 am: 6d9acafc

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



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