am 0f1d4b95: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge: fcd7cb7 automerge: c73d810 automerge: aac2885

* commit '0f1d4b9548c48f9ccb4f81a8d7bb44d7e68f41a7':
  Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue