am 8d4f3df2: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/providers/ContactsProvider into eclair-mr2-plus-aosp

Merge commit '8d4f3df2bcc18ae53978dbf782f73959fd2c6b50'

* commit '8d4f3df2bcc18ae53978dbf782f73959fd2c6b50':
  [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest