tree a5644b9b175adf475cb1188f0db272735526df64
parent e6b2cd3620f8060b40b20fc192b69f619203cd76
parent e9d328d6a67cd333ae6fd141cbbe64e10bd8a9ce
author Xin Li <delphij@google.com> 1646734746 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646734746 +0000

[automerger skipped] Merge Android 12L am: e9d328d6a6 -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: Ia35580122aba527bdd2c5b2f84fb6a4ae72e858a