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

Change-Id: Ib5d33330f4bf4a7542df1f0e29fff8a9ed4fe2e2