[automerger skipped] Merge 24Q3 to AOSP main am: 970dbe25ff -s ours

am skip reason: Merged-In I2bb62ca28f73bf858e11eee4aa6c452e18db1ea4 with SHA-1 3757c9164a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/Mms/+/3257127

Change-Id: I51739b3e8605f1958f2bdb12c5b197bdd80dd550
Signed-off-by: Automerger Merge Worker <[email protected]>