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

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

Change-Id: Idfa74b229b2d53279477e228fdf4326a24e69c95