Snap for 6377590 from ca944930d15ba04d780c020d5711d01f58af1071 to r-keystone-qcom-release

Change-Id: I941112123af4600715f49fa9bcf7ddc64e5bcab4
diff --git a/java/android/compat/annotation/Android.bp b/java/android/compat/annotation/Android.bp
index adc579e..c607e5d 100644
--- a/java/android/compat/annotation/Android.bp
+++ b/java/android/compat/annotation/Android.bp
@@ -24,6 +24,7 @@
         "LoggingOnly.java",
     ],
     sdk_version: "core_current",
+    exported_plugins: ["compat-changeid-annotation-processor"],
 }
 
 // Don't forget to depend on exported_plugins, if using sources directly
@@ -36,6 +37,7 @@
         "LoggingOnly.java",
         "UnsupportedAppUsage.java",
     ],
+    visibility: ["//libcore:__pkg__"],
 }
 
 java_library {
diff --git a/java/android/processor/compat/changeid/Android.bp b/java/android/processor/compat/changeid/Android.bp
index e63893a..3bd831a 100644
--- a/java/android/processor/compat/changeid/Android.bp
+++ b/java/android/processor/compat/changeid/Android.bp
@@ -45,8 +45,6 @@
     name: "compat-changeid-annotation-processor",
     processor_class: "android.processor.compat.changeid.ChangeIdProcessor",
 
-    visibility: ["//visibility:public"],
-
     java_resources: [
         "META-INF/**/*",
     ],
@@ -57,4 +55,9 @@
     installable: false,
 
     use_tools_jar: true,
+
+    visibility: [
+        "//libcore:__pkg__",
+        "//tools/platform-compat/java/android/compat/annotation:__subpackages__",
+    ],
 }