[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 am: d7e81225 -s ours am: 09805443 -s ours

am skip reason: Merged-In Ia7e56b7d9b857a76036161cbd6edd981bed3bb6c with SHA-1 90d73e4e is already in history

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

Change-Id: I8ec8884149c94cdbf8e034c89b138f7818f3fc12