Merge "Make libhidl(base|memory) apex-available for com.android.neuralnetworks."
diff --git a/transport/base/1.0/vts/functional/vts_ibase_test.cpp b/transport/base/1.0/vts/functional/vts_ibase_test.cpp
index 4d3d6ab..b96e3b0 100644
--- a/transport/base/1.0/vts/functional/vts_ibase_test.cpp
+++ b/transport/base/1.0/vts/functional/vts_ibase_test.cpp
@@ -234,7 +234,7 @@
 TEST_F(VtsHalBaseV1_0TargetTest, ServiceProvidesAndDeclaresTheSameInterfaces) {
     const Result<ServiceInterfacesMap> service_interfaces_map =
             android::init::GetOnDeviceServiceInterfacesMap();
-    ASSERT_TRUE(service_interfaces_map) << service_interfaces_map.error();
+    ASSERT_RESULT_OK(service_interfaces_map);
 
     std::map<std::string, std::set<FqInstance>> hidl_interfaces_map;