Revert "Changing contact aggregation to not join from same account"

This reverts commit 2a0d5f9c628e723261bc5198e0fd606076b76b74.

Bug: 3086301

Change-Id: I7f05eb14122687950ca7d22d591fc172c463045e
4 files changed