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