am b9e55995: [Issue 2176079] Fixing the test: ContactAggregatorPerformanceTest

Merge commit 'b9e55995411cc4390972a552e5361727ad795374' into eclair-plus-aosp

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