Handle sync status 7 properly

* This indicates a failed upsync (due to a conflict with the server);
  it is rare but causes subsequent sync failure.  Very P1'ish
* Note that this is directly related to EAS 14.1 usage, and the case
  in which the server has a "replied" update to send to the client
* We now, do a subsequent sync without upsync, and THEN, when we've
  gotten the latest from the server, try to register our changes

Bug: 5111438
Change-Id: Ic1268316b3286eb92ec2f143742dd6ed1b39d153
3 files changed