[automerger skipped] Merge Android 14 QPR2 to AOSP main am: a268d720 -s ours...

[automerger skipped] Merge Android 14 QPR2 to AOSP main am: a268d720 -s ours am: 50ca63ee -s ours

am skip reason: Merged-In I3a7b6043fc086e561ff08cfe2aa62b63d7111725 with SHA-1 39d9a7cf is already in history

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



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