Merge "Fix build breakage" am: ed1e3b50f3 am: d1ac3e6971

Original change: https://android-review.googlesource.com/c/platform/build/+/2618395

Change-Id: If400807d8d4b7c240bbfe7c1f9331f0cd2611160
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tools/aconfig/Android.bp

@@ -66,17 +66,22 @@ device_config_value_set {
     ],
 }
 
+java_device_config_definitions_library {
+    name: "aconfig_test_java",
+    device_config_definitions: "aconfig.test.flags",
+}
+
 android_test {
     name: "aconfig.test.java",
     srcs: [
         "tests/**/*.java",
-        ":aconfig.test.flags{.srcjar}",
     ],
     manifest: "tests/AndroidManifest.xml",
     certificate: "platform",
     static_libs: [
         "androidx.test.rules",
         "testng",
+        "aconfig_test_java",
     ],
     test_suites: ["device-tests"],
 }