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

Change-Id: I345eab0653feb3d6aa9d063315bbdcf0f9ca44ea