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

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