[automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours

am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

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

Change-Id: Ie75fb77cf964d5462299062dda15acd5c6df5ddf