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

Merge commit '24aa3c4087d9cf101cf7866dff5ec68d52db77eb' into eclair-mr2-plus-aosp

* commit '24aa3c4087d9cf101cf7866dff5ec68d52db77eb':