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

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

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