[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: 18c89dfd -s ours am: 18338a4f -s ours am: d9b51dce -s ours

am skip reason: skipped by user drysdale

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



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