Merge "Skip legacy-fs-verity setup if file already has it" into qt-dev am: 4fd5870662
am: 6ebd3bf5e8

Change-Id: Ie135ad897405c56175719d722bd29a963e778830