Merge "fs_mgr: allow disable dm-verity when the device is unlocked without metadata"
am: 17c84b2cca

Change-Id: I4e0e5ed112cb8d8abd0ee666e1c4d903713c9bbd