am 40bbe34a: am 7fce0a78: am 2679e70f: am 320ffd89: am 8a6889c5: am aac28857: Merge "Fix CTS android.provider package testAccountRemovalWithMergedContact_doesNotDeleteContactAndTimestampUpdated seldom fail issue" into jb-mr2-cts-dev automerge: fcd7cb7 automerge: c73d8

* commit '40bbe34a18f08f770502ef47434b3a8680be6b6e':