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

Merge "[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" into sc-v2-dev-plus-aosp am: 1b62417b

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

Change-Id: I77dfa01ef891601e17ed02c544a896b65f803bae