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

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

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