Merge "KeyMint VTS: cope with ATTEST_KEY +/- SIGN" am: 11cb564913 am: cbaede3f72

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

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