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

Change-Id: I15110e1403bbd3b99f9f2ad72d1e092b83beeb0b