[automerger skipped] Merge "Allow udfps when strong auth is required" into...

[automerger skipped] Merge "Allow udfps when strong auth is required" into sc-qpr1-dev am: d00f2acc -s ours am: 3133ffd5 -s ours am: cd8e2931 -s ours

am skip reason: Merged-In Ia7e56b7d9b857a76036161cbd6edd981bed3bb6c with SHA-1 83dd25e7 is already in history

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

Change-Id: I79c6739613f7a19288134439416e98d699a4d40c