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

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

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