Write verity first, then do fs verification am: 8704c83dbe am: e7dee6860b

Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1696829

Change-Id: I094ddc43779fcf30784ab3f25f2e773bc593f1bb