Merge "keystore2: fix UnlockedDeviceRequired to work without LSKF" into main am: dfbab7e6bc

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2805742

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