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

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

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