[automerger skipped] Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd am: 171b2938 -s ours

am skip reason: skipped by user joshmccloskey

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

Change-Id: Idd47c8a5af6794944e7bc189930bf93344d591c4