Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am:...

Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd am: 4e95cc22

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

Change-Id: I07273033599a02e31d97256a3de169b1e1152e54