Merge changes I8174adf8,I9d252b0b

* changes:
  Expose system property for dm-verity check_at_most_once
  Fix flaky AVB test from late verity_update_state