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: df427391 -s ours am: 41e198fc -s ours
  [automerger skipped] KeyMint VTS: cope with ATTEST_KEY +/- SIGN am: cdfb9615 -s ours am: c94e96ba -s ours