[automerger skipped] DO NOT MERGE - Merge Android 13 am: aee8039030 -s ours am: 0e6cdf2eb7 -s ours am: ad83b97fc2 -s ours am: ecdfb3e761 -s ours

am skip reason: subject contains skip directive

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

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