am 1cb927fe: am 46a3b3dd: 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: c73d8

* commit '1cb927fe2ca3d9183963a81e317e4cc18c063f96':
  Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue