Merge "Disallow non-local returns in tryTest{}"
diff --git a/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt b/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
index fb45582..bacbbe3 100644
--- a/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
+++ b/staticlibs/testutils/hostdevice/com/android/testutils/Cleanup.kt
@@ -76,7 +76,7 @@
 }
 
 @CheckReturnValue
-inline fun tryTest(block: () -> Unit): ExceptionCleanupBlock {
+fun tryTest(block: () -> Unit): ExceptionCleanupBlock {
     try {
         block()
     } catch (e: Exception) {