[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: 5edce7f4 -s ours am: 85e03612 -s ours

am skip reason: skipped by user joshmccloskey

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

Change-Id: I8d903d3eed9e54203c19180eb4188cfc32a3d6cf