Merge "LockSettingsService: fix UnlockedDeviceRequired to work without LSKF" into main