Snap for 10453563 from 289689dc538c07e97ada96cd41349a7145e2091c to mainline-adservices-release

Change-Id: Ib8829f39a604a32f052b72b8e5a7a4267e198b1d
diff --git a/Android.bp b/Android.bp
index 33b84a0..535fc7a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -42,13 +42,16 @@
     hostdex: true,
     sdk_version: "core_current",
     srcs: ["src/**/*.java"],
-    apex_available:[
+    apex_available: [
         "//apex_available:platform",
         "com.android.adservices",
+        "com.android.devicelock",
         "com.android.extservices",
+        "com.android.healthfitness",
         "com.android.ondevicepersonalization",
     ],
 }
+
 //
 // TCK (Test Compatibility Kit)
 // -- For DI frameworks that want to test compatibility with javax.
@@ -59,4 +62,9 @@
         "jsr330",
         "junit",
     ],
+    errorprone: {
+        javacflags: [
+            "-Xep:OverridesJavaxInjectableMethod:WARN",
+        ],
+    },
 }