tree a5d5a1f3039df226e087c80b10e483ee57a1cca1
parent 5f142281cf8065385d7d97c6873991f692bbaccd
parent a269c85780b1c000e750f34ed109a634f2dac46b
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1655708717 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1655708717 +0000

Merge changes from topic "am-82b42a6714224b3695f7cad98786c537" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into tm-dev am: df427391cd -s ours am: 41e198fc40 -s ours
  [automerger skipped] KeyMint VTS: cope with ATTEST_KEY +/- SIGN am: cdfb961585 -s ours am: c94e96ba1b -s ours