[automerger skipped] Merge "[DO NOT MERGE] toString method for ScanFastPairStoreItem helps debug" into tm-dev am: 145b381e0f am: ed51a3267f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Nearby/+/16963269

Change-Id: Ic379d47ca113aa93383875fb993abbddbb890cfa
diff --git a/nearby/halfsheet/Android.bp b/nearby/halfsheet/Android.bp
index 2b35254..486a3ff 100644
--- a/nearby/halfsheet/Android.bp
+++ b/nearby/halfsheet/Android.bp
@@ -28,7 +28,7 @@
     certificate: ":com.android.nearby.halfsheetcertificate",
     libs: [
         "framework-bluetooth",
-        "framework-connectivity-tiramisu",
+        "framework-connectivity-t",
         "nearby-service-string",
     ],
     static_libs: [
diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp
index 8f6a227..6743c21 100644
--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@@ -53,7 +53,7 @@
     libs: [
         "framework-bluetooth.stubs.module_lib", // TODO(b/215722418): Change to framework-bluetooth once fixed
         "error_prone_annotations",
-        "framework-connectivity-tiramisu.impl",
+        "framework-connectivity-t.impl",
         "framework-statsd.stubs.module_lib",
     ],
     static_libs: [
diff --git a/nearby/tests/cts/fastpair/Android.bp b/nearby/tests/cts/fastpair/Android.bp
index 9cbd7d0..599fe5c 100644
--- a/nearby/tests/cts/fastpair/Android.bp
+++ b/nearby/tests/cts/fastpair/Android.bp
@@ -29,7 +29,7 @@
     ],
     libs: [
         "android.test.base",
-        "framework-connectivity-tiramisu.impl",
+        "framework-connectivity-t.impl",
     ],
     srcs: ["src/**/*.java"],
     test_suites: [