[automerger skipped] Merge "Udfps enrollment now focuses on fingerprint...

[automerger skipped] Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd -s ours am: 4b466450 -s ours am: ca6f0cb6 -s ours am: d7f242b2 -s ours

am skip reason: skipped by user joshmccloskey

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

Change-Id: I0372747d55567ee69ba23a9e42fc153813760fd7