[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 -s ours am: 7dc662ee -s ours am: 71e334ca -s ours

am skip reason: Merged-In Ie10b705bb06990a2a2c6223fcce28f5fde6bf3f3 with SHA-1 22fb9c16 is already in history

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



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