[automerger skipped] Merge Android 12 QPR 3 am: 41406c60 -s ours am:...

[automerger skipped] Merge Android 12 QPR 3 am: 41406c60 -s ours am: c91ff443 -s ours am: bb06e4f5 -s ours am: ffc5132b -s ours

am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e17 is already in history

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



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