Merge "Fix ContentResolverSyncTestCase#testCancelSync" into oc-dev
am: f509201e5b

Change-Id: Ib1e241ba2e5284844a21774a4a4f907f1d6342a8