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: 6d9acafc" into tm-qpr-dev-plus-aosp am: e4366a1b

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



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