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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I91343f7b4d50969c61f2142c7b9d15e3e6de8ade