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

Change-Id: If3779eceac8084723c101a6f7fa9091c4f09128e