[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: dd1eeb280f -s ours

am skip reason: Merged-In Iba5169f65fbba4b90e6767caebf1d0c96f299a63 with SHA-1 e189fb70f7 is already in history

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

Change-Id: Ifca56a8216ade16d8ab63329ac2fc04741890530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>