Merge "fs_mgr: support different dm-verity error modes"
am: b9b95ee3a9

Change-Id: I2761343b66be35c01ee4365f2ff004b7f912a117