Merge "Mark Status as Sync and Send." am: c9c0dfbfc5 am: 241b62b26d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1620972

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6281a203849d431eb70b8f052b4e9933dc67f71