[automerger skipped] Merge "Make FingerprintManager show BiometricPrompt for...

[automerger skipped] Merge "Make FingerprintManager show BiometricPrompt for UDFPS" into sc-dev am: b92e7e8a -s ours

am skip reason: Change-Id I60ba2dce983812996f6baa44557533575051e476 with SHA-1 f60975b6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec239dd14ae4652507fd02e5839e4a15c14e99b2