Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d

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



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