Snap for 8730993 from 12c1f5c53f43d434571e34d5748cfb8efab82c9a to mainline-tzdata3-release

Change-Id: I90460950414d1194018e7d9dbb61da6fbec0a113
diff --git a/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt b/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt
index 3d68727..5132fcf 100644
--- a/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt
+++ b/checks/src/main/java/com/android/apifinder/ApiFinderDetector.kt
@@ -1,4 +1,4 @@
-package com.google.android.apifinder
+package com.android.apifinder
 
 import com.android.tools.lint.client.api.UElementHandler
 import com.android.tools.lint.detector.api.*
diff --git a/checks/src/main/java/com/android/apifinder/ApiFinderIssueRegistry.kt b/checks/src/main/java/com/android/apifinder/ApiFinderIssueRegistry.kt
index 0bd1b3a..f2f91e2 100644
--- a/checks/src/main/java/com/android/apifinder/ApiFinderIssueRegistry.kt
+++ b/checks/src/main/java/com/android/apifinder/ApiFinderIssueRegistry.kt
@@ -1,13 +1,12 @@
-package com.google.android.apifinder
+package com.android.apifinder
 
 import com.android.tools.lint.client.api.IssueRegistry
-import com.android.tools.lint.detector.api.CURRENT_API
 import com.google.auto.service.AutoService
 
 @AutoService(IssueRegistry::class)
 @Suppress("UnstableApiUsage")
 class ApiFinderIssueRegistry : IssueRegistry() {
     override val api: Int
-        get() = CURRENT_API
+        get() = 7
     override val issues = listOf(ApiFinderDetector.ISSUE)
 }
diff --git a/checks/src/test/java/com/android/apifinder/ApiFinderDetectorTest.kt b/checks/src/test/java/com/android/apifinder/ApiFinderDetectorTest.kt
index f9dd466..397fe07 100644
--- a/checks/src/test/java/com/android/apifinder/ApiFinderDetectorTest.kt
+++ b/checks/src/test/java/com/android/apifinder/ApiFinderDetectorTest.kt
@@ -1,4 +1,4 @@
-package com.google.android.apifinder
+package com.android.apifinder
 
 import com.android.tools.lint.checks.infrastructure.LintDetectorTest
 import com.android.tools.lint.detector.api.Detector