[automerger skipped] Merge "KeyMint VTS: don't combine ATTEST_KEY with SIGN" into sc-v2-dev am: 46d62b92fb -s ours am: b017ca4ae8 -s ours

am skip reason: Merged-In Ib6e4ad98cbe5c3015138854679b11fa0e683ade9 with SHA-1 b3b121493d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/16264937

Change-Id: I52192784a990c92e773bb001171cdb0de47b2b08