[automerger skipped] Skip ab/6749736 in stage. am: 79b4382fc3 -s ours

am skip reason: Change-Id I0a6ebef1ef342258391bddeb34f5cc719ff28449 with SHA-1 6f8bb7e75e is in history

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

Change-Id: Ic45124f2d068430b60dec959b719de106b90d4ac