[automerger skipped] [conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/-...

[automerger skipped] [conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev am: bbecb456 am: 3803a10f -s ours am: d407b640 -s ours am: f64f801f -s ours

am skip reason: skipped by user drysdale

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



Change-Id: If7605e387fe12d921f716da68b99cb65cbc10f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>