[automerger skipped] Merge "Implement KeyMint2 test for VSR13" into tm-dev am:...

[automerger skipped] Merge "Implement KeyMint2 test for VSR13" into tm-dev am: d782e213 am: 1d6d7381 -s ours

am skip reason: Merged-In Ie10b705bb06990a2a2c6223fcce28f5fde6bf3f3 with SHA-1 8292bc92 is already in history

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



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