[automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is...

[automerger skipped] Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d -s ours am: 83e4a8a3 -s ours am: 180742fd -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: I8e48d47b88c271333ad2a6761c80f28795ba8f3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>