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

Change-Id: Ibdc7cd211aa89ba36735dec25cf8cd3d11fa4da0