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

Change-Id: Ifecb3f446533ba44917d9a1361ad16a1a4447268