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

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

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