Merge "Allow uninstantiated BootloaderStateTest" am: d83eed2fe3

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

Change-Id: Ib65464e48fdbe6b79c97a750db77e70c7669a0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp b/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
index fdadad4..723edee 100644
--- a/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
+++ b/security/keymint/aidl/vts/functional/BootloaderStateTest.cpp
@@ -79,8 +79,6 @@
     ASSERT_FALSE(attestedBootloaderState) << "This test runs as root. Bootloader must be unlocked.";
 }
 
-INSTANTIATE_TEST_SUITE_P(PerInstance, BootloaderStateTest,
-                         testing::ValuesIn(getAidlHalInstanceNames(IKeyMintDevice::descriptor)),
-                         ::android::PrintInstanceNameToString);
+INSTANTIATE_KEYMINT_AIDL_TEST(BootloaderStateTest);
 
 }  // namespace aidl::android::hardware::security::keymint::test