Merge "fs_mgr: support upstream dm-verity without error correction"
am: 907ec7daa7

* commit '907ec7daa761624012476e540d8fe473b67b94bf':
  fs_mgr: support upstream dm-verity without error correction