[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 5317cefc43 -s ours am: a691b0d558 -s ours
am skip reason: Merged-In I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3 with SHA-1 6e0ca56095 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16845232
Change-Id: I942c9338d7b3615aeb34e9b56e00baa7f222533b
This commit is contained in: