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

am skip reason: Merged-In I102674aa519cf562aa8d0b852ebb8067748894a6 with SHA-1 c6b06859a3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/27273844

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