Fix wrong sync message issue for pending outgoing messages am: bccecb6393 am: 6af3221619 am: cf7a8b123a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifae7ac0acbe08f351b9c057a5912c3fe175ae02e