[automerger skipped] Merge "For non-udfps, detectFP if primaryAuth required"...

[automerger skipped] Merge "For non-udfps, detectFP if primaryAuth required" into tm-qpr-dev am: a94c4e12 am: 3f37924a -s ours

am skip reason: Merged-In Ic1d4984c7514fc96b6552267128dee814730bb30 with SHA-1 4f32a4dd is already in history

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



Change-Id: I2d5dae3a88b0fed257331643ae93dc584ffe9f50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>