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

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