Merge "keystore2: make UnlockedDeviceRequired fix unconditional" into main