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

Change-Id: I905f5d7be07fa77f8846edec56eef9a1fb298296