Merge "fs_mgr: Fix disable-verity for verifyatboot partitions"