am f85cbad8: am 21341494: am 4ed821c5: 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 'f85cbad857a76c0919af1586fbfcb146e40b53a5':
  Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue