[automerger skipped] Fix Fingerprint enrollment UI when display size is largest. am: 2ca3f323 -s ours am: e0aa02b1 -s ours am: 84f8ea71 -s ours

am skip reason: Merged-In Ifbe6c92c4213979952f2f89a1cd595c9c4bff6ec with SHA-1 2eadf684 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605



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