Merge "fs_mgr: allow no verity metadata when the device is unlocked." am: cd0c2d8962
am: 328b56585e

Change-Id: Ib8602958bffa7061a11ca4450b3dfdaf462b63f6