Merge "fs_mgr_verity: allow verification error when the device is unlocked"