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

Change-Id: I78bab02e15cc6ffe7f693377217c325e40894e67