Merge "Merge "Udfps enrollment now focuses on fingerprint region" into sc-dev am: f375efdd7b" into sc-qpr1-dev am: 85626f1b4b

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

Change-Id: Id484e5194a2ecb5949ead1c563c1cbed586f49cf