Merge "Merge "Fix the lockscreen height recalculation on face auth." into...

Merge "Merge "Fix the lockscreen height recalculation on face auth." into tm-dev am: 519157a1 am: a1ac0c83 am: 40d81346" into tm-qpr-dev-plus-aosp am: 79aadd31

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



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