Merge "Allow udfps when strong auth is required" into sc-qpr1-dev am: d00f2acc

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

Change-Id: I69e7792538ee2a4c4f9c88e2deb0f4f532411a06