am 13e8af05: am b6b66f8f: am 02f1d80a: Merge "Restore verity state when verified partition is reflashed"

* commit '13e8af053b425b66199dc12b89c02236b517fac9':
  Restore verity state when verified partition is reflashed