Merge "Fix UnlockedDeviceRequired with biometric unlock with unified challenge" into main am: f3a6dcf1d7 am: 6aa86d6610 am: fa2d2b7421

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

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