[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 skip reason: skipped by user drysdale

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



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