am 6c3b205c: am 759717ee: Merge "Update partition.*.verified even with ro.boot.veritymode set"

* commit '6c3b205c408f92101ddfa053cb134371e951a9a7':
  Update partition.*.verified even with ro.boot.veritymode set