[automerger skipped] DO NOT MERGE - Merge Android 13 am: aee80390 -s ours am: 0e6cdf2e -s ours

am skip reason: Merged-In Ibbc4fb11e96b5179ff5dec906e74c9d582b6fb97 with SHA-1 909a0763 is already in history

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



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