Merge "Add ConfigInfrastructure lib to Android.bp"

Tethering/Android.bp

@@ -34,6 +34,7 @@ java_defaults {
     // Libraries not including Tethering's own framework-tethering (different flavors of that one
     // are needed depending on the build rule)
     libs: [
+        "framework-configinfrastructure",
         "framework-connectivity.stubs.module_lib",
         "framework-connectivity-t.stubs.module_lib",
         "framework-statsd.stubs.module_lib",

Tethering/tests/unit/Android.bp

@@ -68,6 +68,7 @@ java_defaults {
         "framework-minus-apex",
         "framework-res",
         "framework-bluetooth.stubs.module_lib",
+        "framework-configinfrastructure",
         "framework-connectivity.impl",
         "framework-connectivity-t.impl",
         "framework-tethering.impl",

nearby/service/Android.bp

@@ -87,6 +87,7 @@ java_library {
         "androidx.annotation_annotation",
         "framework-bluetooth",
         "error_prone_annotations",
+        "framework-configinfrastructure",
         "framework-connectivity-t.impl",
         "framework-statsd",
     ],

nearby/tests/cts/fastpair/Android.bp

@@ -31,6 +31,7 @@ android_test {
     libs: [
         "android.test.base",
         "framework-bluetooth.stubs.module_lib",
+        "framework-configinfrastructure",
         "framework-connectivity-t.impl",
     ],
     srcs: ["src/**/*.java"],

service-t/Android.bp

@@ -47,6 +47,7 @@ java_library {
     ],
     libs: [
         "framework-annotations-lib",
+        "framework-configinfrastructure",
         "framework-connectivity-pre-jarjar",
         "framework-connectivity-t-pre-jarjar",
         "framework-tethering",

service/Android.bp

@@ -146,6 +146,7 @@ java_library {
     ],
     libs: [
         "framework-annotations-lib",
+        "framework-configinfrastructure",
         "framework-connectivity-pre-jarjar",
         // The framework-connectivity-t library is only available on T+ platforms
         // so any calls to it must be protected with a check to ensure that it is