[conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into...

[conflict] Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" into android12-tests-dev am: bbecb456

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



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