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: 7255771a

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



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