Merge tag 'android-15.0.0_r6' of https://android.googlesource.com/platform/frameworks/opt/telephony into HEAD

Android 15.0.0 Release 6 (AP4A.241205.013)

Change-Id: I59f393e9d1d833fcd5ac44cc82d66538d95d2a59
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
index cf44aaf..cc06ca6 100644
--- a/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
+++ b/src/java/com/android/internal/telephony/metrics/PersistAtomsStorage.java
@@ -1708,7 +1708,7 @@
                             Files.readAllBytes(mContext.getFileStreamPath(FILENAME).toPath()));
             // Start from scratch if build changes, since mixing atoms from different builds could
             // produce strange results
-            if (!Build.FINGERPRINT.equals(atoms.buildFingerprint)) {
+            if (!String.valueOf(Build.TIME).equals(atoms.buildFingerprint)) {
                 Rlog.d(TAG, "Build changed");
                 return makeNewPersistAtoms();
             }
@@ -2644,7 +2644,7 @@
         PersistAtoms atoms = new PersistAtoms();
         // allow pulling only after some time so data are sufficiently aggregated
         long currentTime = getWallTimeMillis();
-        atoms.buildFingerprint = Build.FINGERPRINT;
+        atoms.buildFingerprint = String.valueOf(Build.TIME);
         atoms.voiceCallRatUsagePullTimestampMillis = currentTime;
         atoms.voiceCallSessionPullTimestampMillis = currentTime;
         atoms.incomingSmsPullTimestampMillis = currentTime;