Snap for 9550733 from 3a795313d365109154124b9d075920f2cd17392d to mainline-tzdata5-release

Change-Id: I91264176a2929875feffaf2a98fba83272c8bc27
diff --git a/Android.bp b/Android.bp
index db6b4af..50f0832 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,7 +34,7 @@
 
   srcs: ["**/*.java"],
   apex_available: [
-        "com.android.bluetooth",
+        "com.android.btservices",
   ],
   sdk_version: "module_current",
   min_sdk_version: "Tiramisu",
diff --git a/src/com/android/obex/HeaderSet.java b/src/com/android/obex/HeaderSet.java
index 28c12ae..d1afe4f 100644
--- a/src/com/android/obex/HeaderSet.java
+++ b/src/com/android/obex/HeaderSet.java
@@ -36,6 +36,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.security.SecureRandom;
+import java.util.Arrays;
 import java.util.Calendar;
 
 /**
@@ -725,4 +726,20 @@
             return responseCode;
         }
     }
+
+    @Override
+    public String toString() {
+        return "HeaderSet " + System.identityHashCode(this) + ": NAME=" + mName;
+    }
+
+    public String dump() {
+        return "Dumping HeaderSet " + this
+            + "\n\tCONNECTION_ID : " + Arrays.toString(mConnectionID)
+            + "\n\tNAME : " + mName
+            + "\n\tTYPE : " + mType
+            + "\n\tTARGET : " + Arrays.toString(mTarget)
+            + "\n\tWHO : " + Arrays.toString(mWho)
+            + "\n\tAPPLICATION_PARAMETER : " + Arrays.toString(mAppParam)
+            + "\n\tDumping HeaderSet END";
+    }
 }