Merge "Add VSR annotation to KeyMint tests" into main am: a2441d90 am:...

Merge "Add VSR annotation to KeyMint tests" into main am: a2441d90 am: dfa27bbd am: 9352d1a7 am: d35553f9 am: 8b19a2c7

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



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