Merge "fs_mgr_verity: allow verification error when the device is unlocked" am: a68f633675 am: 84937296c6
am: e5de94756b

Change-Id: Iedca76aea1c93320bbba29bcd013d1cd331380de