am 6904e0c2: am a88fb24a: Merge "Add fs_mgr support for dm-verity modes"

* commit '6904e0c263a02f08c9c6f555dceafa2cce467954':
  Add fs_mgr support for dm-verity modes