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

[automerger skipped] Merge "Allow udfps when strong auth is required" into sc-v2-dev am: 92287d60 am: 55468e33 -s ours

am skip reason: Merged-In Ia7e56b7d9b857a76036161cbd6edd981bed3bb6c with SHA-1 11dddec1 is already in history

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

Change-Id: I1dd83bae07bcc6a03b7af1105cafb3cf501d1c40