Merge "Update partition.*.verified even with ro.boot.veritymode set"