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: 40d81346

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



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