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

Change-Id: I21b6817855bfa2742bb8795c952c366366a825e2