Mark ab/6881855 as merged am: 89efbab65d am: 7310312ac1

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

Change-Id: Ib0dea4ed6a0ad62c8039c9b31e92617dc198a2ce