Merge "Run VmAttestationTests for vendor API >= 202504" into main am: a246251ef3

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3345806

Change-Id: I720d344733577609b3e9987a1f49df2b5ab451f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/vm_attestation/src/java/com/android/virt/vm_attestation/testapp/VmAttestationTests.java b/tests/vm_attestation/src/java/com/android/virt/vm_attestation/testapp/VmAttestationTests.java
index ce23b7b..f9cd78d 100644
--- a/tests/vm_attestation/src/java/com/android/virt/vm_attestation/testapp/VmAttestationTests.java
+++ b/tests/vm_attestation/src/java/com/android/virt/vm_attestation/testapp/VmAttestationTests.java
@@ -68,9 +68,7 @@
         assume().withMessage("Remote attestation is not supported on CF.")
                 .that(isCuttlefish())
                 .isFalse();
-        assume().withMessage("Test needs Remote Attestation support")
-                .that(getVirtualMachineManager().isRemoteAttestationSupported())
-                .isTrue();
+        ensureVmAttestationSupported();
 
         VirtualMachineConfig.Builder builder =
                 newVmConfigBuilderWithPayloadBinary(VM_PAYLOAD_PATH)