Snap for 6660490 from 84052f24c4260257c01e298a454cb044a5c01242 to sdk-release

Change-Id: Ic5d624efcb8c5a1d59baafe883a1469b5e10f284
diff --git a/Android.bp b/Android.bp
index afd3fa0..7df7356 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,11 +27,14 @@
 
     static_libs: [
         "//external/error_prone:error_prone_core",
-        "//external/dagger2:dagger2-auto-service",
+    ],
+
+    libs: [
+        "//external/auto:auto_service_annotations",
     ],
 
     plugins: [
-        "//external/dagger2:dagger2-auto-service",
+        "//external/auto:auto_service_plugin",
     ],
 
     javacflags: ["-verbose"],