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

[automerger skipped] Merge "Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd" into sc-qpr1-dev am: 85626f1b am: 05d4b1cb am: 91b3256e -s ours

am skip reason: Merged-In I07273033599a02e31d97256a3de169b1e1152e54 with SHA-1 a77a18fd is already in history

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

Change-Id: I77030b92715a3d47d7d302e0ded666134d809d48