Merge "Add VSR annotation to KeyMint tests" into main am: a2441d9090 am: dfa27bbd75 am: 9352d1a7c8 am: d35553f996

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

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