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

Change-Id: I9983f42efb88fcb4e837ced6e243e32f05b3ef16