Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
am: 906d8f57bf

Change-Id: Ied5b515396764d398807c4f945aaf55af87de03a